Fixed issue with quoted underscores in primary key attribute names.