Filtering modules method update

Change from a one-check method, to a more “Okay, who wants to filter
this” method.