Add search function and its button
Merge branch 'master' into work