Add search, clean and some fix