main search fixes