De facto revert of previous changes to search form