Corrected model handling for various uid fields.