Listing all of the services for a tag should work. We can address this in a separate PR though.

Besides that and a couple of other minor things - LGTM, +1.