Fixed Filter bug