adding updated default criteria functionality to attempt to guarantee data segmentation between clients