Refactor to use ApplicationSearchFilter.