Added future:shop=convenience and future:amenity=fuel with brand in changeset 94095100. If this opens and you catch it before I do, just remove the future prefix and add name(s) as needed, and you should be good to go.