Better calendar filtering