fixes ZEN-8344 - Added map with the sub location.