Revert "Still debuggin image issue"

This reverts commit 934a6ed70abf82f805136e4bd712746a6fefbce5.
Revert "Maps - multiple images issue"

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

This reverts commit aa403f9ef5b23fa501107c657bb7cb1f99865127.