Added TODO
Simplified query helper
Merge branch 'queryHelperRefactoring'