Filter class fix