update search route & fix rebase fail
Add unit presentation in search page