Simplified & refactored search modal.