diff --git a/app/build.gradle b/app/build.gradle
index c907262b2c..02cc05d3dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,8 +22,8 @@ android {
         applicationId "com.eventyay.attendee"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 12
-        versionName "0.6.0"
+        versionCode 13
+        versionName "0.6.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt
index dcf6895f9e..7748797710 100644
--- a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt
@@ -267,7 +267,7 @@ class EventDetailsFragment : Fragment() {
             .nonNull()
             .observe(viewLifecycleOwner, Observer {
                 rootView.feedbackProgress.isVisible = it
-                rootView.feedbackBtn.isEnabled = !it
+                rootView.feedbackBtn.isVisible = !it
             })
 
         eventViewModel.eventFeedback.observe(viewLifecycleOwner, Observer {
@@ -286,7 +286,10 @@ class EventDetailsFragment : Fragment() {
         eventViewModel.submittedFeedback
             .nonNull()
             .observe(viewLifecycleOwner, Observer {
-                feedbackAdapter.add(it)
+                if (feedbackAdapter.itemCount < LIMITED_FEEDBACK_NUMBER)
+                    feedbackAdapter.add(it)
+                else
+                    rootView.seeFeedbackTextView.isVisible = true
                 rootView.feedbackRv.isVisible = true
                 rootView.noFeedBackTv.isVisible = false
             })
diff --git a/app/src/main/java/org/fossasia/openevent/general/search/type/SearchTypeFragment.kt b/app/src/main/java/org/fossasia/openevent/general/search/type/SearchTypeFragment.kt
index 7f59c52ba5..2a0a6ef8d5 100644
--- a/app/src/main/java/org/fossasia/openevent/general/search/type/SearchTypeFragment.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/search/type/SearchTypeFragment.kt
@@ -28,7 +28,7 @@ class SearchTypeFragment : Fragment() {
     private val searchTypeViewModel by viewModel<SearchTypeViewModel>()
     private val safeArgs: SearchTypeFragmentArgs by navArgs()
     private lateinit var rootView: View
-    private val eventTypesList: MutableList<String> = arrayListOf(getString(R.string.anything))
+    private val eventTypesList = ArrayList<String>()
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -41,6 +41,7 @@ class SearchTypeFragment : Fragment() {
         rootView.eventTypesRecyclerView.layoutManager = LinearLayoutManager(activity)
         rootView.eventTypesRecyclerView.adapter = typesAdapter
         searchTypeViewModel.loadEventTypes()
+        eventTypesList.add(getString(R.string.anything))
 
         searchTypeViewModel.connection
             .nonNull()
diff --git a/app/src/main/res/layout/content_event.xml b/app/src/main/res/layout/content_event.xml
index 73b053eb7f..1aae5762d3 100644
--- a/app/src/main/res/layout/content_event.xml
+++ b/app/src/main/res/layout/content_event.xml
@@ -557,12 +557,13 @@
 
                 <Button
                     android:id="@+id/feedbackBtn"
+                    style="@style/ThreeDS2TextButtonStyle"
+                    android:textAllCaps="true"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/layout_margin_small"
-                    android:layout_marginStart="@dimen/layout_margin_large"
-                    android:layout_marginEnd="@dimen/layout_margin_large"
+                    android:layout_marginTop="@dimen/layout_margin_medium"
                     android:layout_marginBottom="@dimen/layout_margin_large"
+                    android:textColor="@color/colorAccent"
                     android:text="@string/write_feedback" />
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_event.xml b/app/src/main/res/layout/fragment_event.xml
index 439d703bba..aaf28f8a8c 100644
--- a/app/src/main/res/layout/fragment_event.xml
+++ b/app/src/main/res/layout/fragment_event.xml
@@ -40,7 +40,7 @@
                 layout="@layout/content_event"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginBottom="@dimen/event_details_divider_margin"
+                android:layout_marginBottom="@dimen/layout_margin_extreme_large"
                 bind:event="@{event}" />
 
             <View
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 85f7bbca07..803fdef0a2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -356,11 +356,11 @@
     <string name="and_i_m_up_for">And I\'m up for</string>
     <string name="what_type">What Sounds good?</string>
     <string name="feedback">Feedback</string>
-    <string name="write_feedback">Write Feedback</string>
+    <string name="write_feedback">Write a feedback</string>
     <string name="submit">Submit</string>
     <string name="submit_feedback">Submit Feedback</string>
     <string name="feedback_submitted">Feedback submitted Successfully</string>
-    <string name="be_the_first_to_write_a_review">Be the first to write a review</string>
+    <string name="be_the_first_to_write_a_review">Be the first to write a feedback</string>
     <string name="frequently_asked_questions">Frequently Asked Questions</string>
     <string name="no_faq_message">There are no frequenly asked questions for this event.</string>
 
diff --git a/fastlane/metadata/android/en-US/changelogs/13.txt b/fastlane/metadata/android/en-US/changelogs/13.txt
new file mode 100644
index 0000000000..85629ff9e9
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/13.txt
@@ -0,0 +1,21 @@
+**v0.6.1:**
+HOTFIX: Fix search filter crashing
+
+**v0.6.0:**
+🚀 Features and Enhancements
+
+- Update tickets section and display ticket status
+- Add donation tickets
+- Verify email and reset password with the app
+- Edit profile image
+- Improve filtering and sorting
+- Add pagination in different sections
+- Several UI enhancement
+
+🐛 Bug Fixes
+
+- Multiple crashes
+- Fixes for API < 24
+- Error handling
+- Billing information for paid tickets
+- Event's time and timezone
diff --git a/scripts/update-apk.sh b/scripts/update-apk.sh
index 0ad80878a4..db8b5c1a73 100644
--- a/scripts/update-apk.sh
+++ b/scripts/update-apk.sh
@@ -66,5 +66,6 @@ if [ "$TRAVIS_BRANCH" != "$PUBLISH_BRANCH" ]; then
     exit 0
 fi
 
+cd ..
 gem install fastlane
-fastlane supply --aab eventyay-attendee-master-app.aab --skip_upload_apk true --track alpha --json_key ../scripts/fastlane.json --package_name $PACKAGE_NAME
+fastlane supply --aab ./apk/eventyay-attendee-master-app.aab --skip_upload_apk true --track alpha --json_key ./scripts/fastlane.json --package_name $PACKAGE_NAME