Respect recent mmaster changes. Fixes #271
Merge pull request #272 from owncloud/master-query-fix

Respect recent master changes. Fixes #271