Enhanced tags

Enhance the capability to add multiple tags