Fix filtering so that null fields fail.