add kind to street and some fix