Rework of the deprecated macro from issue #537

Fixes to support the new macro.  Also a change to radius filter to comply with the newly deprecated constructor.