Make default_logo_check more smarter