updated queries

Change-Id: I5812082c3c45fd5e0ae76e21e3128eddadfbc4bb
Merge pull request #1 from tfreier/master

These Queries should work