Update search form field names.
Update search controller to enable restoring field values.