fixed refactor uri issue