Fixed the update the tags. Ticket # 1417