Still trying to fix the search bug.