[cavedude]

This works perfectly. I don't have a problem with the code and query being committed, unless anybody else has any objections. It even allowed me to correct a couple of Necro AAs that have been nagging at the back of my mind.