Added self streets to location function