make date part predicates stricter