better short url matching