Some code cleanup
Added search_doc_navigator waffle flag.