Rolling back some changes to try and get search to work again