Search form template improvments