updates to Search Form Flow