Added some filter changes to select by class