AnnoQuery Overwrite Fix

Anno query no longer only pushes the last catid's data. More fixes to
follow.
Merge branch 'master' of https://github.com/julianweisbord/fhsapp_v2