CAL-912 some minor fix on searching events