Added search. Navigates back OK