Reachability fix
Change of badge logic