Refactored search
Fixed some issues with validation (required fields) and default values