Properly deal with E.164 and Prefix routing