added validation for queries
Merge branch 'development' of https://github.com/scrollback/scrollback into development