align search form fields with database field names