Search form fixes