*8263* Correct order of fields; missing country field; extra required flag