Better filtering on the queries for results.
Merge branch 'master' of github.com:crertel/swarmmanipulate