Bug fix for Tenant Database routing