fixes for streets and labels