This problem is not specific to Follow Me. It would also affect blind transfer, call forwarding, ring groups or queues with external agents, etc. You should decide on a consistent format for numbers in your system. As needed, incoming calls should have a custom context to rewrite caller ID, and/or outgoing calls should have a hook to rewrite the caller ID before it is sent to the trunk. See