Update implementation of calendar getter and fetch predicate.