Merge "Fix HTML export category handling"