Refactor to replace @filter with @filter_field