Add union support
Improved multiple orderby suppot