Change tenantQueryVisitor class by adding a parameter for tenantId and add command interceptor to set the correct value