Add new search and fox a few bugs