Fix sort fields