Added randomization to FindMatch Query