Fix CS
Fix duplicate tag names