Feature/return missing fields

alignment issue.