aligned with map2app repo
fixed firenze
fixed vienna
Revert "fixed vienna"

This reverts commit 44384e7aa2689c3b04dd3cbd59b6bffc2547f8f2.
fixed problem with vienna