improve datapoint filtering