cleanup and fix of between
predicates not return t or nil again