Fix tempalte logic bug and add search tab to non-logged in topbar. MJ-605