diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java
index f904c56..e113642 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java
+++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java
@@ -300,9 +300,9 @@
 
     @Override
     public Void visitSelectOperator(SelectOperator op, Integer indent) throws AlgebricksException {
-        String retainMissing = op.getMissingPlaceholderVariable() != null
+        String retainMissing = (op.getMissingPlaceholderVariable() != null)
                 ? " retain-untrue (" + op.getMissingPlaceholderVariable() + " <- " + op.getRetainMissingAsValue() + ")"
-                : "";
+                : (op.getRetainMissingAsValue() != null ? " retain-untrue" : "");
         addIndent(indent).append("select (").append(op.getCondition().getValue().accept(exprVisitor, indent))
                 .append(")").append(retainMissing)
                 .append(op.isProjectPushed() ? " project: " + str(op.getProjectVariables()) : "");
diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java
index 3ca1277..9344ae3 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java
+++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java
@@ -781,6 +781,14 @@
         try {
             jsonGenerator.writeStringField(OPERATOR_FIELD, "select");
             writeStringFieldExpression(CONDITION_FIELD, op.getCondition(), indent);
+            if (op.getRetainMissingAsValue() != null) {
+                LogicalVariable placeholderVar = op.getMissingPlaceholderVariable();
+                IAlgebricksConstantValue retainValue = op.getRetainMissingAsValue();
+                if (placeholderVar != null) {
+                    jsonGenerator.writeStringField("retain-untrue-variable", String.valueOf(placeholderVar));
+                }
+                jsonGenerator.writeStringField("retain-untrue-value", String.valueOf(retainValue));
+            }
             if (op.isProjectPushed()) {
                 writeArrayFieldOfVariables(PROJECT_VARIABLES_FIELD, op.getProjectVariables());
             }
