Fix mapping for visual keys