code cleanup in search/navigator