Rewrite fact filters to take advantage of hibernate criteria api