Microsoft Teams Incoming call via Direct Route shows "Spam Likely" for 4-digit extension

Well this was working just fine until "New calling experience" was rolled out in the latest Teams client version. You have to keep in mind that Direct Routing is not just meant to connect to the PSTN but also to be able to seamlessly communicate to on premise PBX systems which more often than not are not configured for E164 format. I use Cisco CUBE for most implementations which is very simple to configure and I do follow to the T the Cisco and Microsoft configuration guide so I'm not trying to reinvent the wheel here. What I need is for Microsoft to find a way to let 4 or 5 digits in the calling number come across the Teams client without any Spam Likely label which in my opinion is absurd. I know I can manipulate the digits in the CUBE and force an E164 number appear in the Teams client but that defeats the purpose because customers don't want to see the full number for their own business reasons. Believe me, I've tried persuading customers into E164 format but not all like the idea, specially when it interferes with business processes. Spam Likely labeling should be optional like a policy in my humble opinion. Erik365Online