improve mandatory fields, #9260