upgrade freepbx broke custom ivr

i upgraded to freepbx 2.5.2.2, ivr which then dials a custom application as a destination died.
in my extensions_additional.conf i have this for the ivr where it calls the custom apps if I press 1,2,3,4, etc

exten => 1,1,dbDel(${BLKVM_OVERRIDE})
exten => 1,n,Set(__NODEST=)
exten => 1,n,Goto(ext-appduty-custom,1,1)
exten => 2,1,dbDel(${BLKVM_OVERRIDE})
exten => 2,n,Set(__NODEST=)
exten => 2,n,Goto(ext-smduty-custom,1,1)
exten => 3,1,dbDel(${BLKVM_OVERRIDE})
exten => 3,n,Set(__NODEST=)
exten => 3,n,Goto(ext-dbaduty-custom,1,1)
exten => 4,1,dbDel(${BLKVM_OVERRIDE})
exten => 4,n,Set(__NODEST=)
exten => 4,n,Goto(ext-netduty-custom,1,1)
exten => 5,1,dbDel(${BLKVM_OVERRIDE})
exten => 5,n,Set(__NODEST=)
exten => 5,n,Goto(ext-biduty-custom,1,1)

then the actual custom app

more extensions_smduty.conf
[ext-smduty-custom]
exten => 1,1,Noop(MiscDest: Duty)
exten => 1,2,SetCALLERID(502)
exten => 1,3,Dial(Zap/g2/00xxxxxxxxxx)
exten => 1,4,Hangup

then finally the asterisk log, it looks like it calls the correct app, but it just hangs up instead of dailing the number.

Executing DBdel("Zap/32-1", "") in new stack
-- Executing Set("Zap/32-1", "__NODEST=") in new stack
-- Executing Goto("Zap/32-1", "ext-netduty-custom|1|1") in new stack
-- Goto (ext-netduty-custom,1,1)
-- Hungup 'Zap/32-1'

I believe I may have found the issue, it seem new version of freepbx more strict, had now way of finding my extensions_netduty.conf file, moved that configuration to extensions_custom and it worked, but would like to keep it the way it was as we have a cgi script to edit the extensions_netduty.conf file, I think I need to add an include extensions_netduty.conf file to my extensions_custom.conf file, is this correct.