[#1163] Updated the search form