refactor numeric and raw filters