PIM-3237: Remove base filter and add some specialized filters