Revert testing stuff and put search back