Refactor search forms