Added handling for duplicate tags in incoming controller