Completed orderBy feature