Changed URL mapping to use new (shorter) match IDs