Merge pull request #457 from joola/develop

#453 Hotfix to query issue.