Rest Filter and CriteriaOLD refactoring