Fixed the umbrella connection issue with menu choice brand mappings