Merge pull request #2427 from rmehta/develop

[fix] client side queries