refactor, fix, improve import pipeline, fix missing addresses for ways issue