Standardise all Tags input to use the same one, everywhere

Before this we had 2 versions of inputs for Tags, this release makes sure we only use 1 variant