Refactored search forms