Add filter & fix getType
test
Calendar