CAL-238 fix filter event by category and calendar