Don't fully override default by-uri assignment
Merge branch 'project' of github.com:UnissonCo/dataserver into project