move geo filters and numeric range to use new field data