multitenant fix

in this request contains multitenant fix.