Hotfix simple query

fix and start adding testing for #5 issue