diff --git a/queries.py b/queries.py
index 54aa8ff..f5b412c 100644
--- a/queries.py
+++ b/queries.py
@@ -450,7 +450,8 @@ STOCURI_371_SUMAR = """
 --   (b) calcul vechime: (data_ref - 1) - NVL(dataout, datain)
 WITH s AS (
     SELECT
-        s.id_grupa, s.grupa, s.id_subgrupa, s.subgrupa,
+        NVL(s.grupa, 'NECLASIFICAT') AS grupa,
+        NVL(s.subgrupa, '-') AS subgrupa,
         (s.cants + s.cant - s.cante) * s.pret AS val,
         ROUND((:data_referinta - 1) - NVL(s.dataout, s.datain)) AS zile
     FROM vstoc s
@@ -460,8 +461,8 @@ WITH s AS (
       AND (s.cants + s.cant - s.cante) <> 0
 )
 SELECT
-    NVL(grupa, 'NECLASIFICAT') AS grupa,
-    NVL(subgrupa, '-') AS subgrupa,
+    grupa,
+    subgrupa,
     GROUPING_ID(grupa, subgrupa) AS grouping_level,
     ROUND(SUM(val), 2) AS valoare_total,
     ROUND(SUM(CASE WHEN zile <= 180 THEN val ELSE 0 END), 2) AS val_0_6_luni,