Fix some issues with the search form.