Add matching for streets (~95% of them)