Changing initialSelection-mechanic to highlight only for primaryKeys, automatic propertyname list after semicolon and less whitespace