FIXED: broken mapping list in evaluate window