Changes to eliminate duplicate tags