* fix(query): #5861 Changes query which improves performance
* fix(test): fixed all the build test
* fix(test): fixed all the build test
* fix(test): fixed all the build test
* fix(test): fixed all the build test
* fix(test): fixed all the build test
* fix(test): fixed all the build test