CAL-912 remove unnecessary workaround after improve jcr query