Better design for second seraches