Fixed: Removed Mode filter