Some suggestions to make these edits better:

Instead of combining the name of the government offices occupying the same building, add those POIs individually.

I know that it's a bit tedious, but when mapped as separate features, it allows other people to find them easily, and can add more details (e.g. contact details,) for each, separately.

If you prefer a "gamified" approach to mapping, and you're on Android, try out StreetComplete:  https://streetcomplete.app
