search fixes / improvements