Fixed bug with 6-digit numbers & codes

Fixed bug with 6-digit numbers contains some city or mobile code. Some
code redesign