support base urls with upstream kvp