Fixed tags issues.