Fix issues with query handling
Fix issues with query handling

robinedwards/neomodel,bleib1dj/neomodel,andrefsp/neomodel,robinedwards/neomodel,cristigociu/neomodel_dh,fpieper/neomodel,pombredanne/neomodel,wcooley/neomodel,bleib1dj/neomodel