Adjustments for search bar, uuid cache groundwork

Eze and Naor