Search session fixes