Implemented correct streets detection