diff --git a/audit_management/audit_management/notification/audit_query_bm_responded/audit_query_bm_responded.json b/audit_management/audit_management/notification/audit_query_bm_responded/audit_query_bm_responded.json
index 5f0b719..e7e9338 100755
--- a/audit_management/audit_management/notification/audit_query_bm_responded/audit_query_bm_responded.json
+++ b/audit_management/audit_management/notification/audit_query_bm_responded/audit_query_bm_responded.json
@@ -20,7 +20,7 @@
  "recipients": [
   {
    "cc": "criticalreview@sahayogmultistate.com\ngondiaaudit@sahayogmultistate.com\nkamraj.mahapatra@sahayogmultistate.com\n{% if doc.owner in [\"3649@sahayog.com\", \"6105@sahayog.com\", \"6929@sahayog.com\"] %}kaveri.a@sahayogmultistate.com,{% endif %}",
-   "condition": "doc.bm_user_status == \"Responded\"",
+   "condition": "doc.bm_user_status == \"Responded\" and doc.bm_response_box",
    "receiver_by_document_field": "query_generated_by_mail"
   }
  ],
diff --git a/audit_management/audit_management/notification/audit_query_ceo_responded/audit_query_ceo_responded.json b/audit_management/audit_management/notification/audit_query_ceo_responded/audit_query_ceo_responded.json
index 36587fa..13b04cd 100755
--- a/audit_management/audit_management/notification/audit_query_ceo_responded/audit_query_ceo_responded.json
+++ b/audit_management/audit_management/notification/audit_query_ceo_responded/audit_query_ceo_responded.json
@@ -20,7 +20,7 @@
  "recipients": [
   {
    "cc": "criticalreview@sahayogmultistate.com\ngondiaaudit@sahayogmultistate.com\nkamraj.mahapatra@sahayogmultistate.com\n{% if doc.owner in [\"3649@sahayog.com\", \"6105@sahayog.com\", \"6929@sahayog.com\"] %}kaveri.a@sahayogmultistate.com,{% endif %}",
-   "condition": "doc.ceo_user_status == \"Responded\"",
+   "condition": "doc.ceo_user_status == \"Responded\" and doc.ceo_response_box",
    "receiver_by_document_field": "query_generated_by_mail"
   }
  ],
diff --git a/audit_management/audit_management/notification/audit_query_com_responded/audit_query_com_responded.json b/audit_management/audit_management/notification/audit_query_com_responded/audit_query_com_responded.json
index 0e7ef80..0a0b06a 100755
--- a/audit_management/audit_management/notification/audit_query_com_responded/audit_query_com_responded.json
+++ b/audit_management/audit_management/notification/audit_query_com_responded/audit_query_com_responded.json
@@ -20,7 +20,7 @@
  "recipients": [
   {
    "cc": "criticalreview@sahayogmultistate.com\ngondiaaudit@sahayogmultistate.com\nkamraj.mahapatra@sahayogmultistate.com\n{% if doc.owner in [\"3649@sahayog.com\", \"6105@sahayog.com\", \"6929@sahayog.com\"] %}kaveri.a@sahayogmultistate.com,{% endif %}",
-   "condition": "doc.com_user_status == \"Responded\"",
+   "condition": "doc.com_user_status == \"Responded\"and doc.com_response_box",
    "receiver_by_document_field": "query_generated_by_mail"
   }
  ],
diff --git a/audit_management/audit_management/notification/audit_query_coo_responded/audit_query_coo_responded.json b/audit_management/audit_management/notification/audit_query_coo_responded/audit_query_coo_responded.json
index 140cfa2..7d98f8a 100755
--- a/audit_management/audit_management/notification/audit_query_coo_responded/audit_query_coo_responded.json
+++ b/audit_management/audit_management/notification/audit_query_coo_responded/audit_query_coo_responded.json
@@ -20,7 +20,7 @@
  "recipients": [
   {
    "cc": "criticalreview@sahayogmultistate.com\ngondiaaudit@sahayogmultistate.com\nkamraj.mahapatra@sahayogmultistate.com\n{% if doc.owner in [\"3649@sahayog.com\", \"6105@sahayog.com\", \"6929@sahayog.com\"] %}kaveri.a@sahayogmultistate.com,{% endif %}",
-   "condition": "doc.coo_user_status == \"Responded\"",
+   "condition": "doc.coo_user_status == \"Responded\" and doc.coo_response_box",
    "receiver_by_document_field": "query_generated_by_mail",
    "receiver_by_role": ""
   }
diff --git a/audit_management/audit_management/notification/audit_query_dh_responded/audit_query_dh_responded.json b/audit_management/audit_management/notification/audit_query_dh_responded/audit_query_dh_responded.json
index 99b9611..649b86c 100755
--- a/audit_management/audit_management/notification/audit_query_dh_responded/audit_query_dh_responded.json
+++ b/audit_management/audit_management/notification/audit_query_dh_responded/audit_query_dh_responded.json
@@ -20,7 +20,7 @@
  "recipients": [
   {
    "cc": "criticalreview@sahayogmultistate.com\ngondiaaudit@sahayogmultistate.com\nkamraj.mahapatra@sahayogmultistate.com\n{% if doc.owner in [\"3649@sahayog.com\", \"6105@sahayog.com\", \"6929@sahayog.com\"] %}kaveri.a@sahayogmultistate.com,{% endif %}",
-   "condition": "doc.dh_user_status == \"Responded\"",
+   "condition": "doc.dh_user_status == \"Responded\"and doc.dh_response_box",
    "receiver_by_document_field": "query_generated_by_mail"
   }
  ],
diff --git a/audit_management/audit_management/notification/audit_query_gm_responded/audit_query_gm_responded.json b/audit_management/audit_management/notification/audit_query_gm_responded/audit_query_gm_responded.json
index d4aa1af..9e6dcc2 100755
--- a/audit_management/audit_management/notification/audit_query_gm_responded/audit_query_gm_responded.json
+++ b/audit_management/audit_management/notification/audit_query_gm_responded/audit_query_gm_responded.json
@@ -20,7 +20,7 @@
  "recipients": [
   {
    "cc": "criticalreview@sahayogmultistate.com\ngondiaaudit@sahayogmultistate.com\nkamraj.mahapatra@sahayogmultistate.com\n{% if doc.owner in [\"3649@sahayog.com\", \"6105@sahayog.com\", \"6929@sahayog.com\"] %}kaveri.a@sahayogmultistate.com,{% endif %}",
-   "condition": "doc.gm_user_status == \"Responded\"",
+   "condition": "doc.gm_user_status == \"Responded\" and doc.gm_response_box",
    "receiver_by_document_field": "query_generated_by_mail"
   }
  ],
diff --git a/audit_management/audit_management/notification/audit_query_hr_responded/audit_query_hr_responded.json b/audit_management/audit_management/notification/audit_query_hr_responded/audit_query_hr_responded.json
index 2c6ddd5..8745992 100755
--- a/audit_management/audit_management/notification/audit_query_hr_responded/audit_query_hr_responded.json
+++ b/audit_management/audit_management/notification/audit_query_hr_responded/audit_query_hr_responded.json
@@ -20,7 +20,7 @@
  "recipients": [
   {
    "cc": "criticalreview@sahayogmultistate.com\ngondiaaudit@sahayogmultistate.com\nkamraj.mahapatra@sahayogmultistate.com\n{% if doc.owner in [\"3649@sahayog.com\", \"6105@sahayog.com\", \"6929@sahayog.com\"] %}kaveri.a@sahayogmultistate.com,{% endif %}",
-   "condition": "doc.hr_user_status == \"Responded\"",
+   "condition": "doc.hr_user_status == \"Responded\" and doc.hr_response_box",
    "receiver_by_document_field": "query_generated_by_mail",
    "receiver_by_role": ""
   }
diff --git a/audit_management/audit_management/notification/audit_query_rm_responded/audit_query_rm_responded.json b/audit_management/audit_management/notification/audit_query_rm_responded/audit_query_rm_responded.json
index fd80c5b..7ee82c2 100755
--- a/audit_management/audit_management/notification/audit_query_rm_responded/audit_query_rm_responded.json
+++ b/audit_management/audit_management/notification/audit_query_rm_responded/audit_query_rm_responded.json
@@ -20,7 +20,7 @@
  "recipients": [
   {
    "cc": "criticalreview@sahayogmultistate.com\ngondiaaudit@sahayogmultistate.com\nkamraj.mahapatra@sahayogmultistate.com\n{% if doc.owner in [\"3649@sahayog.com\", \"6105@sahayog.com\", \"6929@sahayog.com\"] %}kaveri.a@sahayogmultistate.com,{% endif %}",
-   "condition": "doc.rm_user_status == \"Responded\"",
+   "condition": "doc.rm_user_status == \"Responded\"and doc.rm_response_box",
    "receiver_by_document_field": "query_generated_by_mail"
   }
  ],
diff --git a/audit_management/audit_management/notification/audit_query_rom_responded/audit_query_rom_responded.json b/audit_management/audit_management/notification/audit_query_rom_responded/audit_query_rom_responded.json
index c1f7bd0..fbe2f44 100755
--- a/audit_management/audit_management/notification/audit_query_rom_responded/audit_query_rom_responded.json
+++ b/audit_management/audit_management/notification/audit_query_rom_responded/audit_query_rom_responded.json
@@ -20,7 +20,7 @@
  "recipients": [
   {
    "cc": "criticalreview@sahayogmultistate.com\ngondiaaudit@sahayogmultistate.com\nkamraj.mahapatra@sahayogmultistate.com\n{% if doc.owner in [\"3649@sahayog.com\", \"6105@sahayog.com\", \"6929@sahayog.com\"] %}kaveri.a@sahayogmultistate.com,{% endif %}",
-   "condition": "doc.rom_user_status == \"Responded\"",
+   "condition": "doc.rom_user_status == \"Responded\" and doc.rom_response_box",
    "receiver_by_document_field": "query_generated_by_mail"
   }
  ],
diff --git a/audit_management/audit_management/notification/audit_query_zm_responded/audit_query_zm_responded.json b/audit_management/audit_management/notification/audit_query_zm_responded/audit_query_zm_responded.json
index bb87453..9e17aba 100755
--- a/audit_management/audit_management/notification/audit_query_zm_responded/audit_query_zm_responded.json
+++ b/audit_management/audit_management/notification/audit_query_zm_responded/audit_query_zm_responded.json
@@ -20,7 +20,7 @@
  "recipients": [
   {
    "cc": "criticalreview@sahayogmultistate.com\ngondiaaudit@sahayogmultistate.com\nkamraj.mahapatra@sahayogmultistate.com\n{% if doc.owner in [\"3649@sahayog.com\", \"6105@sahayog.com\", \"6929@sahayog.com\"] %}kaveri.a@sahayogmultistate.com,{% endif %}",
-   "condition": "doc.zm_user_status == \"Responded\"",
+   "condition": "doc.zm_user_status == \"Responded\" and doc.zm_response_box",
    "receiver_by_document_field": "query_generated_by_mail"
   }
  ],
diff --git a/audit_management/audit_management/notification/audit_query_zom_responded/audit_query_zom_responded.json b/audit_management/audit_management/notification/audit_query_zom_responded/audit_query_zom_responded.json
index 1c5a07c..fb47ba3 100755
--- a/audit_management/audit_management/notification/audit_query_zom_responded/audit_query_zom_responded.json
+++ b/audit_management/audit_management/notification/audit_query_zom_responded/audit_query_zom_responded.json
@@ -20,7 +20,7 @@
  "recipients": [
   {
    "cc": "criticalreview@sahayogmultistate.com\ngondiaaudit@sahayogmultistate.com\nkamraj.mahapatra@sahayogmultistate.com\n{% if doc.owner in [\"3649@sahayog.com\", \"6105@sahayog.com\", \"6929@sahayog.com\"] %}kaveri.a@sahayogmultistate.com,{% endif %}",
-   "condition": "doc.zom_user_status == \"Responded\"",
+   "condition": "doc.zom_user_status == \"Responded\" and doc.zom_response_box",
    "receiver_by_document_field": "query_generated_by_mail"
   }
  ],