Fixed a URL issue when installed from .org, fixed a JavaScript indexOf issue