CAL-936 Calendar unified search got ineffectively memory usage cause OOME
CAL-936 Improve unified query of calendar connector
CAL-936 minor fix on search query