Query bugfix
Merge pull request #957 from devlab-oy/sami/mobile_bugfix

Mobile: Query bugfix