Fix Primary key not set when column name and field name is not matched