Fix multitenant + RestAdapter