now supporting search in a pretty efficient manner