Server side: query fix
Merge branch 'dev' into dev-test