fix: encode primary key always when encoding resources as values

fix: encode primary key always when encoding resources as values #931