reorganized MACRO definitions in filter