[sorvani]

So much for the simple solution. I'll work in it.
I may need to revert to SoD for testing this. I didn't notice the pet window issue because my pet windows on my UF clients have been screwy since I switched to it.