Fix map by hiding addr instead of removing
Merge branch 'development'
assets