Fix to bus stop fetching