impl/EZP-22111 Added image to map infowindow and refactored code