make match entries only affect their selected match entry subgroups
make shortcut codes clearer