Fixes minor issues with calendar-filter