Revert "going to roll these back"

This reverts commit 5a1783109a5eb8bc127eb0e04888210ee9eb2ec8.
Revert "Fixed search"

This reverts commit d8517f4323d0ad06c9ece89c84177be7ccaee90c.
Revert "Revert "Fixed search""

This reverts commit b07ec614662826c4d9dd9967a5cfe06aac06c6c5.