Fixed #258 by using innerjoin for limiting possible global urls
Merge branch 'bugfix/258' into develop