solved some issues with tagging