Improve finding of adjacent stops