Moving filters out into module