Fix url matching to be greedy with .com/.org