Add optional to search form fields and switch form row order (name first)