Add smart automated matching of URLs