Fix issue with search and some more Bootstrapping