Modified search form to include fields for both json & html searches