Some contacts are saved with the country code in my iPhone which cause receving calls from them on iPad to show the number only with no name. This can be avoided only if I remove the country code. Any ideas on how to make it work both ways?