Fix bad merge which removed advanced search
Fix bad merge which removed advanced search

kb2ma/adagios,opinkerfi/adagios,opinkerfi/adagios,zengzhaozheng/adagios,kb2ma/adagios,opinkerfi/adagios,kb2ma/adagios,kb2ma/adagios,zengzhaozheng/adagios,opinkerfi/adagios,zengzhaozheng/adagios,zengzhaozheng/adagios