ZEN-13928: fixed dict keys errors