And the url is back. So let's loosen up the regex to handle both.