search fixes & UI