Fix sort values not being populated.