Fixes in searching for hitchhikers