Add support for OrderBy a joined table