[Q] CallerID Not matching contacts

---

Looks like the NG Contacts / CallerID matching code is broken.
I can't get the CallerID numbers to match my contacts.
This is Argentina, all my contacts are stored like +54AAANNNNNNNN, it used to work on all my previous Android phones so i don't know what's going on
I tried modifying ro.phone.min_match on /system/build.prop without any effect.
Any clues ?

Update:

If i store the numbers as +54 AAA NNNN-NNNN, Then i get the Contact names, but all SMSs will automatically stop matching the Contacts.
If i store the numbers as +54 9 AAA NNNN-NNNN. (That's the format the carriers here send the From phone number on SMSs), then SMSs will match but not calls.
I tried using Prefixer but it doesn't seem to work at all.
This has not been a problem on my previous Android phone, a Samsung i550 running GingerBread and previously Froyo.
Sounds like we need a setting to tell Android ICS to match just X digits out of the CallerID string just like Windows Mobile has.
Adding both numbers to each contact is not practical when you have 500+ contacts.
I'm running Stock ITL41F.
I've opened a Google Bug Report on http://code.google.com/p/android/issues/detail?id=22813