Remove 2 FIXMEs from search.cpp