Use primary key for feature list in case the display field is not defined
Some minor string adjustment as well