Feature/return missing fields

Missing "type" here again.