Fixed duplicate tag issue