iD 2.19.5 cannot distinguish gas station and c-store with the same name

[cicku]

I'm having this issue for multiple gas brands in the US:

Here is the reproduction: https://imgur.com/a/Pabf2TN

When two kinds of places share the same name, iD cannot pick up the one I clicked. And reselect category from "Feature Type" does not help. I can only bypass this weird behavior by deleting tag first then reselect the correct type of feature.

[matkoniecz]

See also #8304 - it affects even cases where someone have not selected brand at all, just typed name in different shop type