#722246: Search tabs not quite right, particularly with retaining keywords across tabs. This mostly fixes.