changed queryController to singleton