Fixed missing field types and metadatablock_id