Dialplan issues

Hello, i’ve recently discovered people using sip uris that begin with numbers and it’s causing me a headache.

this is a snippet of my dialplan

[general-out]
exten => _800NXXXXXX,1,Dial(SIP/*1${EXTEN}@sipbroker.com,r)
exten => _844NXXXXXX,1,Dial(SIP/*1${EXTEN}@sipbroker.com,r)
exten => _855NXXXXXX,1,Dial(SIP/*1${EXTEN}@sipbroker.com,r)
exten => _866NXXXXXX,1,Dial(SIP/*1${EXTEN}@sipbroker.com,r)
exten => _877NXXXXXX,1,Dial(SIP/*1${EXTEN}@sipbroker.com,r)
exten => _888NXXXXXX,1,Dial(SIP/*1${EXTEN}@sipbroker.com,r)
exten => _NXXNXXXXXX,1,Macro(dialprovider)
exten => _1NXXNXXXXXX,1,Macro(dialprovider)
exten => _+1NXXNXXXXXX,1,Macro(dialprovider)
exten => _+X.,1,Macro(dialsipbroker,${EXTEN:0})
exten => _*X.,1,Macro(dialsipbroker,${EXTEN:0}) ; SIP-Code dialing
exten => _[a-z].,1,Macro(uridial,${EXTEN}@${SIPDOMAIN})
exten => _[A-Z].,1,Macro(uridial,${EXTEN}@${SIPDOMAIN})
;exten => _X.,1,Macro(uridial,${EXTEN}@${SIPDOMAIN})

I’m wondering if there’s a way to say if the phone number comes with a domain on it, match this uri dialplan. so for example, i can dial my cell fine, matching nxx, 1nxx, or +1nxx. However, if i try to dial say 22334455667@test.com the @test.com is ignored and it routes via the dialprovider context.