Improve url matching and add greedy matches