Several fixes when searching on docs