Fix categories/types

This fixes the issue identified in !3 (merged) where the category returned by .metadata_category() was of the wrong type. This causes the category of returned data items to be correctly identified.

Important: This merge request depends on !3 (merged). Attempting to merge this before !3 (merged) will automatically merge !3 (merged).