Added support for expr in orderBy