Handle url expansion timeouts
Better handle ambiguous URLs, simpler regex