add missings orderBy / orderWay parameters