ONHP-99 fix submit with scope