Fixing bug with URL's being handled twice