Decreased initial number of stops for query
Added more logging