V2: more post conversion, fixed header categories