Done it! Thanks for pointing it out.

Should I add the address tag to the convenience store point and the way area marked "Texaco Gas Station" around it?

Yes, there is. I'm marking it as "Texaco Gas Station" and then adding shop=convenience because there's a convenience store inside. Is the right approach?