Refactored filter-vals for performance