search fixes, improvements