[#154] Fixed map items