diff --git a/supplychain/init.py b/supplychain/init.py
index 2ed83c3..17a460f 100644
--- a/supplychain/init.py
+++ b/supplychain/init.py
@@ -664,11 +664,13 @@ WHERE resellerid = ${resellerid}$
 WHERE contract_id = ${contract_id}$
     AND ((prodtypeid = ${prodtypeid}$ AND productid = ${productid}$)
          OR (prodtypeid = ${prodtypeid}$ AND productid IS NULL)
+         OR (prodtypeid IS NULL AND productid = ${productid}$)
          OR (prodtypeid IS NULL AND productid IS NULL))
 ORDER BY
     CASE WHEN prodtypeid IS NOT NULL AND productid IS NOT NULL THEN 1
          WHEN prodtypeid IS NOT NULL AND productid IS NULL THEN 2
-         ELSE 3 END
+         WHEN prodtypeid IS NULL AND productid IS NOT NULL THEN 3
+         ELSE 4 END
 LIMIT 1"""
                 recs_sci = await sor.sqlExe(sql_sci, {
                     "contract_id": contract_id,
@@ -705,11 +707,13 @@ WHERE resellerid = ${resellerid}$
 WHERE agreement_id = ${agreement_id}$
     AND ((prodtypeid = ${prodtypeid}$ AND productid = ${productid}$)
          OR (prodtypeid = ${prodtypeid}$ AND productid IS NULL)
+         OR (prodtypeid IS NULL AND productid = ${productid}$)
          OR (prodtypeid IS NULL AND productid IS NULL))
 ORDER BY
     CASE WHEN prodtypeid IS NOT NULL AND productid IS NOT NULL THEN 1
          WHEN prodtypeid IS NOT NULL AND productid IS NULL THEN 2
-         ELSE 3 END
+         WHEN prodtypeid IS NULL AND productid IS NOT NULL THEN 3
+         ELSE 4 END
 LIMIT 1"""
                 recs_dai = await sor.sqlExe(sql_dai, {
                     "agreement_id": agreement_id,