Fixes remaining bugs in query collection