Fixed calendar filtering bug