Fixed querying so that it actually works.
Merge branch 'master' of github.com:TeamFauna/dumbo