Add grouped option for new tags in macro