Add selected tags before button

Display group tags correctly