Bug fix for disable preservesOrder optimization when only part of pk column is used