Fix: Url for old source site, and hanging on failed requests