Update search page and some fix