fixes #25 - is null filtering issue