Fix scope and relation ids
Merge branch 'master' of https://github.com/ging/vish into home