Fix point to point routing with middle-points
Fix address routing with the new backend