Fix ordering of datasources