Fixes for singleton queries
Merge pull request #1 from voltprime/master

JSON related fixes
update jar