Converted existing search to work as a form