Fixed duplicate tags happening