Tags normalisation added
Part of randomiser