feature search bugs
Merge branch 'featureSearchBugs' into testing