Fixing number filtering so you can match null values