added tags and strips incorrect tags