More changes to SearchState.