Fixing duplicating tags