CAL-936 Improve unified query of calendar connector