Fix search session - refs BT#8193