Add global zone data search (in topbar)
Tidy up data search functionality