Add Tags field
Fixed tagging issue