More tweaks to the search component.
Mainly verifying the cache strings etc