Updated url matching