Updated search form and template