Revert "Revert "Revert "Maps - multiple images issue"""

This reverts commit 1b885570323b5b01a56303ff9d2d6e7ac7492548.
Revert "Revert "Maps - multiple images issue""

This reverts commit aa403f9ef5b23fa501107c657bb7cb1f99865127.
Revert "Revert "Still debuggin image issue""

This reverts commit 2cf3ced8bf8c8f2c09ab7e8460a01270d606fbbe.