Fixed all remaining misnamed problems in search-state.