added filtering by EOD modules