Fix and test search methods.