Add grouping tagname support for Choice fields