diff --git a/app/build.gradle b/app/build.gradle
index 8f9ba8aa76..e0700589f9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2251
-        versionName "0.22.51"
+        versionCode 2252
+        versionName "0.22.52"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/submission/MySubmissionFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/submission/MySubmissionFragment.kt
index 540f96d4fa..c18e25d82c 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/submission/MySubmissionFragment.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/submission/MySubmissionFragment.kt
@@ -72,6 +72,7 @@ class MySubmissionFragment : Fragment(), CompoundButton.OnCheckedChangeListener
         } else {
             fragmentMySubmissionBinding.rbSurvey.visibility = View.GONE
             fragmentMySubmissionBinding.rbExam.visibility = View.GONE
+            fragmentMySubmissionBinding.rgSubmission.visibility = View.GONE
         }
     }
 
@@ -108,9 +109,12 @@ class MySubmissionFragment : Fragment(), CompoundButton.OnCheckedChangeListener
         if (s.isEmpty()) {
             fragmentMySubmissionBinding.llSearch.visibility = View.VISIBLE
             fragmentMySubmissionBinding.title.visibility = View.VISIBLE
-            if (fragmentMySubmissionBinding.rbSurvey.isChecked) {
+            if (fragmentMySubmissionBinding.rbSurvey.isChecked || type == "survey") {
+                fragmentMySubmissionBinding.tvFragmentInfo.text = "mySurveys"
                 showNoData(fragmentMySubmissionBinding.tvMessage, itemCount, "survey_submission")
+
             } else {
+                fragmentMySubmissionBinding.tvFragmentInfo.text = "mySubmissions"
                 showNoData(fragmentMySubmissionBinding.tvMessage, itemCount, "exam_submission")
             }
 
diff --git a/app/src/main/res/layout/fragment_my_submission.xml b/app/src/main/res/layout/fragment_my_submission.xml
index f54cac7882..b0df6d59eb 100644
--- a/app/src/main/res/layout/fragment_my_submission.xml
+++ b/app/src/main/res/layout/fragment_my_submission.xml
@@ -56,6 +56,7 @@
             android:padding="10dp">
 
             <RadioGroup
+                android:id="@+id/rg_submission"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@drawable/submission_toggle"