Added support for group names by tag
Use simple system names