Handle boulevards and upper/lower roads better