diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java
index 11f8f0f7..52171908 100644
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java
@@ -212,8 +212,6 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
            AND r.map_id ~ '^[0-9]+$'
            AND r.map_id::bigint = msadi.map_sheet_num
            WHERE msl.anal_uid = :analUid
-           AND r.before_c is not null
-           AND r.before_p is not null
            AND r.after_c is not null
            AND r.after_p is not null
             ORDER BY r.uid, r.created_date DESC NULLS LAST
@@ -279,8 +277,8 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
         INNER JOIN tb_map_sheet_anal_data_inference_geom msadig
           ON msadi.data_uid = msadig.data_uid
         WHERE msai.anal_uid = :analUid
-          AND msadig.class_before_cd IS NOT NULL
           AND msadig.class_after_cd  IS NOT NULL
+          AND msadig.class_after_prob  IS NOT NULL
         GROUP BY
           msadig.compare_yyyy
          ,msadig.target_yyyy