Search panel enhancements #30