Revert "Bug fix and added search."

This reverts commit eaa3c03a85c602bbe8e2f9d3cc0f5d672fcdf562.