QueryBuilder: Improved autoJoinOrderBy