search and some fix