fixes from Laurent for the MC branch in the AOD filters