Merge cherry pick from develop
Show when a tag is selected
Can Remove tag from UI