Add orderByName feature