improved baseUriParameter support