Working with improving tags
Fixed tagging problems