changes to search
Merge branch 'Lu-Tao'