Default orderBy fix