Rework of the deprecated macro from issue #537 and fixes to support the new macro.  Also a change to radius filter to comply with the deprecated constructor.