Fixing user issue with bad query (ref to #14)