Add search button on header view
Fix merge conflict with tmp/pids/server.pid