Bugfix orgs pointing to nowhere
Bugfix older browsers