Fixed tags after structure rewrite