Fixed map layers out of sync with the actual EI map