Altered build-quotes-and-urls to return two values