HSTJ-39: baseUri scope bug fixed