diff --git a/common/gmp.cpp b/common/gmp.cpp
index 8d7b0fb..240650d 100755
--- a/common/gmp.cpp
+++ b/common/gmp.cpp
@@ -737,8 +737,8 @@ int GmpProtocol::protocolFrameSize(int streamIndex) const
 
 bool GmpProtocol::isProtocolFrameValueVariable() const
 {
-    // No fields vary for Ssm Query and Report
-    if (isSsmReport() || isSsmQuery())
+    // No fields vary for Ssm Report
+    if (isSsmReport())
         return false;
 
     // For all other msg types, check the group mode
@@ -753,8 +753,8 @@ int GmpProtocol::protocolFrameVariableCount() const
 {
     int count = 1;
 
-    // No fields vary for Ssm Query and Report
-    if (isSsmReport() || isSsmQuery())
+    // No fields vary for Ssm Report
+    if (isSsmReport())
         return count;
 
     // For all other msg types, check the group mode
diff --git a/common/igmpconfig.cpp b/common/igmpconfig.cpp
index d7bdaa4..743e9a3 100644
--- a/common/igmpconfig.cpp
+++ b/common/igmpconfig.cpp
@@ -92,7 +92,7 @@ void IgmpConfigForm::on_msgTypeCombo_currentIndexChanged(int /*index*/)
         break;
 
     case kIgmpV3Query:
-        asmGroup->hide();
+        asmGroup->show();
         ssmWidget->setCurrentIndex(kSsmQueryPage);
         ssmWidget->show();
         break;
diff --git a/common/mldconfig.cpp b/common/mldconfig.cpp
index d6b7b4b..bc871c3 100644
--- a/common/mldconfig.cpp
+++ b/common/mldconfig.cpp
@@ -90,7 +90,7 @@ void MldConfigForm::on_msgTypeCombo_currentIndexChanged(int /*index*/)
         break;
 
     case kMldV2Query:
-        asmGroup->hide();
+        asmGroup->show();
         ssmWidget->setCurrentIndex(kSsmQueryPage);
         ssmWidget->show();
         break;