Hide country code on incoming calls

i am on the latest build of FreePBX distro. i created a custom inbound to strip off the my country code. It’s working fine but not for Follow-Me. local numbers are not shown properly. +65 61234567 is now shown as +61 23-456-7 (Australia)

exten => _./_65NXXXXXXX,1,Set(CALLERID(number)=${CALLERID(number):2})
exten => _./_NXXXXXXX,n,Set(CALLERID(name)=${CALLERID(name):2})
exten => _./_NXXXXXXX,n,Goto(from-pstn,${EXTEN},1)
exten => _.,1,Goto(from-pstn,${EXTEN},1)
exten => s,1,Goto(from-pstn,${EXTEN},1

is there any other way so that Follow me can show the correct format?