Added RangeFilter and NoIndexFilter