Added ability to change org via query string parameter