Fix for missing level2 categories
Fix for broken dump