search and nav fixes