implement uri hash changes from PR 47