Updates build and fixed Search