Fix code that relied on old tag format that completely breaks the code in new format.