Caller ID and CNAM only displays first 8 digits?

I have an issue where my phone only display the first 8 digits of the caller ID, I think this is the CNAM rather than the CID. Also some numbers here (UK) have a hyphen and a space i.e. 01234-567 8901 rather than 012345678901 this messes the caller diplay up on the phone showing as 01234567208901 where the space is shown as added 20. The phone only has a single line.

Any ideas how to correct this please ?

Dave

Systems details:-
Linksys 3102
RasPBX
Asterisk 11.5.0, FreePBX 2.11.0.10