#17 Simpler change: don't be too greedy in matching output after URL