Better filtering for zeros