Ensure output folders get created
Refine address query
Remove unneeded comment for NCPR retirements