Samsung Galaxy Note 4 — Contact Note Displaying During calls

I recently upgraded from the SAMSUNG NOTE 3 to the NOTE 4. Awesome phone! Running: Android 4. 4. 4
But there is a problem:
All my Contacts are saved with the international dialling code format (+44 123 etc).
When I receives calls in my local area, which come without the international dialling prefix, only the number shows, no contact name though it is in my CONTACTS database.
Any SMS Text and all international calls are okay, as these come with the international dialling code and phone recognises the number and Contact.
Currently, the only workaround, which I find unacceptable, is to save the Contact name and number twice, once with the international dialling code, and another as it would be received as a local number.
This is unacceptable, as it would mean doing this for every single number i have, otherwise when i travel the overseas numbers (now local) would not show a Contact name.I have 7,500 Contacts, never been a problem when i was using the NOTE 3.
I understand from a couple of others using the same phone they are experiencing the same problem. Does anyone know how to resolve this? Please help