Added group tags and changed name of view field