query object + tests
query refactor
Merge pull request #33 from Trott/restrict-chars

refactor query stuff