Fix filtering with 0 value