Changed the order by selector to Order for all datasources.