Change logic on KNN matcher a bit.