HTC One M9 does not recognizing the caller if the country code digits are saved in the phonebook. How can I solve this?

[AC Question]

MTC One M9 not recognizing caller if country code digits saved in phonebook

Hi,
I have recently migrated form Samasung Galaxy S4 to HTC One M9. All of my contacts were previously saved with the leading country code digits, even for numbers in my own country.
Samsung was able to interpret the numbers properly; so when I was on my home network, I would get the Calling Nbr displayed without the country code. If the number is saved in my directory (with country code digits), the name is displayed properly.
So the problem is that the HTC M9 doesn't recognize the contact that is calling because of the leading country code digits that are saved in my directory.

If I save the contact without the country code it is fine, but I need to keep all my contacts with country code so this is not the solution.
The phone needs to recognize the calling number and match against the phonebook according to it's last 7-9 digits.

Does anyone knows how to solve this?

Thanks!