more refactoring of common search views