calendar db strengthened, semi-correct filtering