Additional regex fix and corrections to new radius override logic