Restore subcategories in metadata

Closes #70