Minor search bug fix and test data sets