Make the column more predictable

Take the column order into account and sort non PK columns last