search fixes and improvements