Fix comment. Fix sort fields