Bug Fix: Ensure that URLS are always set