You can just use romance tag for romance and other tags for something else to tell reader what scenes to expect in specific work. Dynasty have good meaningful tags, you can look there how it should be done.
But good point about other languages. Although i prefer yuri, changing it to genre and language-neutral "GL" would be fair considering content isn't Japanese-only. Also i'm not fan of term yaoi (translation isn't something nice at least, etc). Neutral "BL" would be better IMHO.
Anyway there's no reason for using broken "terms" of shoujo/shounen ai.
But good point about other languages. Although i prefer yuri, changing it to genre and language-neutral "GL" would be fair considering content isn't Japanese-only. Also i'm not fan of term yaoi (translation isn't something nice at least, etc). Neutral "BL" would be better IMHO.
Anyway there's no reason for using broken "terms" of shoujo/shounen ai.