fixed loading of context urls
Merge pull request #32 from sandersonet/org-switch-fix

fixed loading of context urls