Updated search form