Code

Updated macro filtering