Minor changes
Quote returned url when used by a script