remove no-longer-annotated objects from HQL annotation queries

this is a minor workaround, the real solution is
http://trac.openmicroscopy.org.uk/ome/ticket/12552