diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/adapter/ChangeRecordCommentFieldAdapterDelegate.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/adapter/ChangeRecordCommentFieldAdapterDelegate.kt
index b617603ff..10030ea65 100644
--- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/adapter/ChangeRecordCommentFieldAdapterDelegate.kt
+++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/adapter/ChangeRecordCommentFieldAdapterDelegate.kt
@@ -1,6 +1,9 @@
 package com.example.util.simpletimetracker.feature_change_record.adapter
 
+import android.content.res.ColorStateList
 import android.text.TextWatcher
+import androidx.annotation.ColorInt
+import androidx.core.view.ViewCompat
 import androidx.core.widget.doAfterTextChanged
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.createRecyclerBindingAdapterDelegate
@@ -10,7 +13,7 @@ import com.example.util.simpletimetracker.feature_change_record.databinding.Chan
 
 fun createChangeRecordCommentFieldAdapterDelegate(
     afterTextChange: (String) -> Unit,
-    onSearchClick: () -> Unit,
+    onFavouriteClick: () -> Unit,
 ) = createRecyclerBindingAdapterDelegate<ViewData, Binding>(
     Binding::inflate,
 ) { binding, item, _ ->
@@ -20,8 +23,13 @@ fun createChangeRecordCommentFieldAdapterDelegate(
 
         if (item.text != etChangeRecordCommentField.text.toString()) {
             etChangeRecordCommentField.setText(item.text)
+            etChangeRecordCommentField.setSelection(item.text.length)
         }
-        btnChangeRecordSearchCommentField.setOnClick { onSearchClick() }
+        ViewCompat.setBackgroundTintList(
+            binding.ivChangeRecordFavouriteComment,
+            ColorStateList.valueOf(item.iconColor),
+        )
+        btnChangeRecordCommentField.setOnClick { onFavouriteClick() }
 
         etChangeRecordCommentField.removeTextChangedListener(textWatcher)
         textWatcher = etChangeRecordCommentField.doAfterTextChanged { afterTextChange(it.toString()) }
@@ -31,6 +39,7 @@ fun createChangeRecordCommentFieldAdapterDelegate(
 data class ChangeRecordCommentFieldViewData(
     val id: Long,
     val text: String,
+    @ColorInt val iconColor: Int,
 ) : ViewHolderType {
 
     override fun getUniqueId(): Long = id
diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/interactor/ChangeRecordViewDataInteractor.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/interactor/ChangeRecordViewDataInteractor.kt
index f510b3064..6e7fefe8b 100644
--- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/interactor/ChangeRecordViewDataInteractor.kt
+++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/interactor/ChangeRecordViewDataInteractor.kt
@@ -13,14 +13,11 @@ import com.example.util.simpletimetracker.domain.interactor.RunningRecordInterac
 import com.example.util.simpletimetracker.domain.model.Record
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.hint.HintViewData
-import com.example.util.simpletimetracker.feature_base_adapter.loader.LoaderViewData
 import com.example.util.simpletimetracker.feature_change_record.R
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordCommentFieldViewData
 import com.example.util.simpletimetracker.feature_change_record.adapter.ChangeRecordCommentViewData
 import com.example.util.simpletimetracker.feature_change_record.mapper.ChangeRecordViewDataMapper
 import com.example.util.simpletimetracker.feature_change_record.model.ChangeRecordDateTimeFieldsState
-import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordFavCommentState
-import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordSearchCommentState
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordViewData
 import javax.inject.Inject
 
@@ -61,11 +58,48 @@ class ChangeRecordViewDataInteractor @Inject constructor(
         )
     }
 
-    suspend fun getLastCommentsViewData(
+    // TODO replace fav to text button?
+    // TODO add button to hide similar comments?
+    suspend fun getCommentsViewData(
+        comment: String,
         typeId: Long,
     ): List<ViewHolderType> {
         data class Data(val timeStarted: Long, val comment: String)
 
+        val items = mutableListOf<ViewHolderType>()
+        val isDarkTheme = prefsInteractor.getDarkMode()
+        val isFavourite = favouriteCommentInteractor.get(comment) != null
+
+        ChangeRecordCommentFieldViewData(
+            id = 1L, // Only one at the time.
+            text = comment,
+            iconColor = if (isFavourite) {
+                resourceRepo.getColor(R.color.colorSecondary)
+            } else {
+                colorMapper.toInactiveColor(isDarkTheme)
+            }
+        ).let(items::add)
+
+        val searchResults = if (comment.isNotEmpty()) {
+            recordInteractor.searchComment(comment)
+                .asSequence()
+                .sortedByDescending { it.timeStarted }
+                .map { it.comment }
+                .toSet()
+                .mapNotNull {
+                    if (it == comment) return@mapNotNull null
+                    ChangeRecordCommentViewData.Last(it)
+                }
+                .takeUnless { it.isEmpty() }
+                ?.let {
+                    HintViewData(
+                        text = resourceRepo.getString(R.string.change_record_similar_comments_hint)
+                    ).let(::listOf) + it
+                }.orEmpty()
+        } else {
+            emptyList()
+        }
+
         val favouriteComments = favouriteCommentInteractor.getAll()
             .map { ChangeRecordCommentViewData.Favourite(it.comment) }
             .takeUnless { it.isEmpty() }
@@ -95,51 +129,11 @@ class ChangeRecordViewDataInteractor @Inject constructor(
                 ).let(::listOf) + it
             }.orEmpty()
 
-        return favouriteComments + lastComments
-    }
+        items += searchResults
+        items += favouriteComments
+        items += lastComments
 
-    suspend fun getFavCommentViewData(
-        comment: String,
-    ): ChangeRecordFavCommentState {
-        val isDarkTheme = prefsInteractor.getDarkMode()
-        val isFavourite = favouriteCommentInteractor.get(comment) != null
-
-        return ChangeRecordFavCommentState(
-            iconColor = if (isFavourite) {
-                resourceRepo.getColor(R.color.colorSecondary)
-            } else {
-                colorMapper.toInactiveColor(isDarkTheme)
-            },
-            isVisible = comment.isNotEmpty(),
-        )
-    }
-
-    suspend fun getSearchCommentViewData(
-        isEnabled: Boolean,
-        isLoading: Boolean,
-        search: String,
-    ): ChangeRecordSearchCommentState {
-        val items = mutableListOf<ViewHolderType>()
-
-        ChangeRecordCommentFieldViewData(
-            id = 1L, // Only one at the time.
-            text = search,
-        ).let(items::add)
-
-        when {
-            isLoading -> LoaderViewData().let(::listOf)
-            search.isEmpty() -> emptyList()
-            else -> {
-                recordInteractor.searchComment(search)
-                    .sortedByDescending { it.timeStarted }
-                    .map { ChangeRecordCommentViewData.Last(it.comment) }
-            }
-        }.let(items::addAll)
-
-        return ChangeRecordSearchCommentState(
-            enabled = isEnabled,
-            items = items,
-        )
+        return items
     }
 
     fun getTimeAdjustmentItems(
diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt
index e9253da2d..421c815d2 100644
--- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt
+++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt
@@ -1,13 +1,13 @@
 package com.example.util.simpletimetracker.feature_change_record.view
 
-import android.content.res.ColorStateList
+import android.annotation.SuppressLint
 import android.view.View
+import android.widget.EditText
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.cardview.widget.CardView
-import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
-import androidx.core.widget.doAfterTextChanged
+import androidx.fragment.app.Fragment
 import androidx.viewbinding.ViewBinding
 import com.example.util.simpletimetracker.core.base.BaseFragment
 import com.example.util.simpletimetracker.core.extension.addOnBackPressedListener
@@ -28,8 +28,8 @@ import com.example.util.simpletimetracker.feature_base_adapter.hint.createHintAc
 import com.example.util.simpletimetracker.feature_base_adapter.hint.createHintAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.hintBig.createHintBigAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.info.createInfoAdapterDelegate
-import com.example.util.simpletimetracker.feature_base_adapter.loader.createLoaderAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.recordType.createRecordTypeAdapterDelegate
+import com.example.util.simpletimetracker.feature_change_record.R
 import com.example.util.simpletimetracker.feature_change_record.adapter.createChangeRecordButtonAdapterDelegate
 import com.example.util.simpletimetracker.feature_change_record.adapter.createChangeRecordChangePreviewAdapterDelegate
 import com.example.util.simpletimetracker.feature_change_record.adapter.createChangeRecordCommentAdapterDelegate
@@ -45,11 +45,10 @@ import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeR
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordChooserState.State.Closed
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordChooserState.State.Comment
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordChooserState.State.Tag
-import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordFavCommentState
-import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordSearchCommentState
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordTagsViewData
 import com.example.util.simpletimetracker.feature_change_record.viewModel.ChangeRecordBaseViewModel
 import com.example.util.simpletimetracker.feature_views.extension.dpToPx
+import com.example.util.simpletimetracker.feature_views.extension.postDelayed
 import com.example.util.simpletimetracker.feature_views.extension.rotateDown
 import com.example.util.simpletimetracker.feature_views.extension.rotateUp
 import com.example.util.simpletimetracker.feature_views.extension.setOnClick
@@ -87,17 +86,13 @@ class ChangeRecordCore(
     private val commentsAdapter: BaseRecyclerAdapter by lazy {
         BaseRecyclerAdapter(
             createHintAdapterDelegate(),
-            createChangeRecordCommentAdapterDelegate(viewModel::onCommentClick),
-        )
-    }
-    private val searchCommentsAdapter: BaseRecyclerAdapter by lazy {
-        BaseRecyclerAdapter(
-            createLoaderAdapterDelegate(),
             createChangeRecordCommentFieldAdapterDelegate(
-                afterTextChange = viewModel::onSearchCommentChange,
-                onSearchClick = viewModel::onSearchCommentClick,
+                afterTextChange = viewModel::onCommentChange,
+                onFavouriteClick = viewModel::onFavouriteCommentClick,
+            ),
+            createChangeRecordCommentAdapterDelegate(
+                onItemClick = viewModel::onCommentClick,
             ),
-            createChangeRecordCommentAdapterDelegate(viewModel::onCommentClick),
         )
     }
     private val actionsAdapter: BaseRecyclerAdapter by lazy {
@@ -140,7 +135,7 @@ class ChangeRecordCore(
             }
             adapter = categoriesAdapter
         }
-        rvChangeRecordLastComments.apply {
+        rvChangeRecordComments.apply {
             layoutManager = FlexboxLayoutManager(context).apply {
                 flexDirection = FlexDirection.ROW
                 justifyContent = JustifyContent.CENTER
@@ -148,14 +143,6 @@ class ChangeRecordCore(
             }
             adapter = commentsAdapter
         }
-        rvChangeRecordSearchComments.apply {
-            layoutManager = FlexboxLayoutManager(context).apply {
-                flexDirection = FlexDirection.ROW
-                justifyContent = JustifyContent.CENTER
-                flexWrap = FlexWrap.WRAP
-            }
-            adapter = searchCommentsAdapter
-        }
         rvChangeRecordAction.apply {
             layoutManager = LinearLayoutManagerWithExtraLayoutSpace(context)
             adapter = actionsAdapter
@@ -166,9 +153,6 @@ class ChangeRecordCore(
         fragment: BaseFragment<T>,
         binding: ChangeRecordCoreLayoutBinding,
     ) = with(binding) {
-        etChangeRecordComment.doAfterTextChanged { viewModel.onCommentChange(it.toString()) }
-        btnChangeRecordFavouriteComment.setOnClick(viewModel::onFavouriteCommentClick)
-        btnChangeRecordSearchComment.setOnClick(viewModel::onSearchCommentClick)
         fieldChangeRecordType.setOnClick(viewModel::onTypeChooserClick)
         fieldChangeRecordCategory.setOnClick(viewModel::onCategoryChooserClick)
         fieldChangeRecordComment.setOnClick(viewModel::onCommentChooserClick)
@@ -217,17 +201,8 @@ class ChangeRecordCore(
             timeStartedAdjustmentItems.observe(containerChangeRecordTimeStartedAdjust.adapter::replace)
             timeEndedAdjustmentItems.observe(containerChangeRecordTimeEndedAdjust.adapter::replace)
             chooserState.observe { updateChooserState(it, binding) }
-            keyboardVisibility.observe { visible ->
-                if (visible) {
-                    showKeyboard(etChangeRecordComment)
-                } else {
-                    hideKeyboard()
-                }
-            }
-            lastComments.observe(commentsAdapter::replace)
-            comment.observe { updateUi(binding, it) }
-            favCommentViewData.observe { setFavCommentState(it, binding) }
-            searchCommentViewData.observe { setSearchCommentState(it, binding) }
+            keyboardVisibility.observe { onKeyboardVisibility(binding, it) }
+            comments.observe(commentsAdapter::replace)
             actionsViewData.observe(::setActionsViewData)
         }
     }
@@ -244,14 +219,6 @@ class ChangeRecordCore(
         }
     }
 
-    fun updateUi(
-        binding: ChangeRecordCoreLayoutBinding,
-        comment: String,
-    ) = with(binding) {
-        etChangeRecordComment.setText(comment)
-        etChangeRecordComment.setSelection(comment.length)
-    }
-
     fun setDateTime(
         state: ChangeRecordDateTimeState,
         dateView: AppCompatTextView,
@@ -292,7 +259,7 @@ class ChangeRecordCore(
         )
         updateChooser<Comment>(
             state = state,
-            chooserData = containerChangeRecordComment,
+            chooserData = rvChangeRecordComments,
             chooserView = fieldChangeRecordComment,
             chooserArrow = arrowChangeRecordComment,
         )
@@ -330,31 +297,6 @@ class ChangeRecordCore(
         actionsAdapter.replace(data)
     }
 
-    private fun setFavCommentState(
-        data: ChangeRecordFavCommentState,
-        binding: ChangeRecordCoreLayoutBinding,
-    ) {
-        ViewCompat.setBackgroundTintList(
-            binding.ivChangeRecordFavouriteComment,
-            ColorStateList.valueOf(data.iconColor),
-        )
-        binding.btnChangeRecordFavouriteComment.visible = data.isVisible
-    }
-
-    private fun setSearchCommentState(
-        data: ChangeRecordSearchCommentState,
-        binding: ChangeRecordCoreLayoutBinding,
-    ) {
-        if (data.enabled) {
-            binding.containerChangeRecordCommentField.visible = false
-            binding.rvChangeRecordSearchComments.visible = true
-        } else {
-            binding.containerChangeRecordCommentField.visible = true
-            binding.rvChangeRecordSearchComments.visible = false
-        }
-        searchCommentsAdapter.replaceAsNew(data.items)
-    }
-
     private fun setTimeEndedVisibility(
         isVisible: Boolean,
         binding: ChangeRecordCoreLayoutBinding,
@@ -364,6 +306,7 @@ class ChangeRecordCore(
         binding.btnChangeRecordTimeEndedAdjust.isVisible = isVisible
     }
 
+    @SuppressLint("SetTextI18n")
     private fun updateCategories(
         data: ChangeRecordTagsViewData,
         binding: ChangeRecordCoreLayoutBinding,
@@ -373,6 +316,20 @@ class ChangeRecordCore(
         tvChangeRecordTagPreview.text = data.selectedCount.toString()
     }
 
+    private fun Fragment.onKeyboardVisibility(
+        binding: ChangeRecordCoreLayoutBinding,
+        visible: Boolean,
+    ) {
+        if (visible) {
+            binding.rvChangeRecordComments.postDelayed(500) {
+                findViewById<EditText>(R.id.etChangeRecordCommentField)
+                    ?.let(::showKeyboard)
+            }
+        } else {
+            hideKeyboard()
+        }
+    }
+
     private inline fun <reified T : ChangeRecordChooserState.State> updateChooser(
         state: ChangeRecordChooserState,
         chooserData: View,
diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordFragment.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordFragment.kt
index 276bf2359..ba70a04c5 100644
--- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordFragment.kt
+++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordFragment.kt
@@ -89,9 +89,6 @@ class ChangeRecordFragment :
     override fun initViewModel() = with(binding) {
         with(viewModel) {
             extra = this@ChangeRecordFragment.extra
-            record.observeOnce(viewLifecycleOwner) {
-                core.updateUi(layoutChangeRecordCore, it.comment)
-            }
             record.observe(::updatePreview)
             core.initViewModel(this@ChangeRecordFragment, layoutChangeRecordCore)
         }
diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewData/ChangeRecordFavCommentState.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewData/ChangeRecordFavCommentState.kt
deleted file mode 100644
index 4bc2905d2..000000000
--- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewData/ChangeRecordFavCommentState.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.example.util.simpletimetracker.feature_change_record.viewData
-
-import androidx.annotation.ColorInt
-
-data class ChangeRecordFavCommentState(
-    @ColorInt val iconColor: Int,
-    val isVisible: Boolean,
-)
\ No newline at end of file
diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewData/ChangeRecordSearchCommentState.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewData/ChangeRecordSearchCommentState.kt
deleted file mode 100644
index 95e85c775..000000000
--- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewData/ChangeRecordSearchCommentState.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.example.util.simpletimetracker.feature_change_record.viewData
-
-import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
-
-data class ChangeRecordSearchCommentState(
-    val enabled: Boolean,
-    val items: List<ViewHolderType>,
-)
\ No newline at end of file
diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt
index 8bee47c33..6181fe55c 100644
--- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt
+++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt
@@ -35,8 +35,6 @@ import com.example.util.simpletimetracker.feature_change_record.model.ChangeReco
 import com.example.util.simpletimetracker.feature_change_record.model.ChangeRecordDateTimeFieldsState
 import com.example.util.simpletimetracker.feature_change_record.model.TimeAdjustmentState
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordChooserState
-import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordFavCommentState
-import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordSearchCommentState
 import com.example.util.simpletimetracker.feature_change_record.viewData.ChangeRecordTagsViewData
 import com.example.util.simpletimetracker.navigation.Router
 import com.example.util.simpletimetracker.navigation.params.screen.ChangeRecordTagFromScreen
@@ -78,11 +76,11 @@ abstract class ChangeRecordBaseViewModel(
             initial
         }
     }
-    val lastComments: LiveData<List<ViewHolderType>> by lazy {
+    val comments: LiveData<List<ViewHolderType>> by lazy {
         return@lazy MutableLiveData<List<ViewHolderType>>().let { initial ->
             viewModelScope.launch {
                 initializePreviewViewData()
-                initial.value = loadLastCommentsViewData()
+                initial.value = loadCommentsViewData()
             }
             initial
         }
@@ -99,18 +97,8 @@ abstract class ChangeRecordBaseViewModel(
             previous = ChangeRecordChooserState.State.Closed,
         ),
     )
-    val searchCommentViewData: LiveData<ChangeRecordSearchCommentState> by lazy {
-        return@lazy MutableLiveData<ChangeRecordSearchCommentState>().let { initial ->
-            viewModelScope.launch {
-                initial.value = loadSearchCommentViewData(isLoading = false, isEnabled = false)
-            }
-            initial
-        }
-    }
     val saveButtonEnabled: LiveData<Boolean> = MutableLiveData(true)
     val keyboardVisibility: LiveData<Boolean> = MutableLiveData(false)
-    val comment: LiveData<String> = MutableLiveData()
-    val favCommentViewData: LiveData<ChangeRecordFavCommentState> = MutableLiveData()
     val timeEndedVisibility: LiveData<Boolean> by lazy { MutableLiveData(isTimeEndedAvailable) }
     val deleteIconVisibility: LiveData<Boolean> by lazy { MutableLiveData(isDeleteButtonVisible) }
     val statsIconVisibility: LiveData<Boolean> by lazy { MutableLiveData(isStatisticsButtonVisible) }
@@ -151,7 +139,6 @@ abstract class ChangeRecordBaseViewModel(
     protected abstract val isStatisticsButtonVisible: Boolean
 
     private var prevRecord: Record? = null
-    private var searchComment: String = ""
     private var searchLoadJob: Job? = null
 
     init {
@@ -166,7 +153,6 @@ abstract class ChangeRecordBaseViewModel(
     protected open suspend fun initializePreviewViewData() {
         // Don't wait for the completion.
         viewModelScope.launch { initializeActions() }
-        viewModelScope.launch { updateFavCommentViewData() }
     }
 
     protected open suspend fun onTimeStartedChanged() {
@@ -301,8 +287,8 @@ abstract class ChangeRecordBaseViewModel(
                 viewModelScope.launch {
                     updatePreview()
                     updateCategoriesViewData()
-                    updateLastCommentsViewData()
                 }
+                updateCommentsViewData()
                 updateActionsData()
             }
 
@@ -361,8 +347,7 @@ abstract class ChangeRecordBaseViewModel(
     }
 
     fun onCommentClick(item: ChangeRecordCommentViewData) {
-        // View update through text change listener.
-        comment.set(item.text)
+        onCommentChange(item.text)
     }
 
     fun onCommentChange(comment: String) {
@@ -370,20 +355,7 @@ abstract class ChangeRecordBaseViewModel(
             if (comment != newComment) {
                 newComment = comment
                 updatePreview()
-                updateFavCommentViewData()
-            }
-        }
-    }
-
-    fun onSearchCommentChange(search: String) {
-        val isEnabled = searchCommentViewData.value?.enabled ?: return
-
-        if (search != searchComment && isEnabled) {
-            searchComment = search
-            searchLoadJob?.cancel()
-            searchLoadJob = viewModelScope.launch {
-                updateSearchCommentViewData(isLoading = true, isEnabled = true)
-                updateSearchCommentViewData(isLoading = false, isEnabled = true)
+                updateCommentsViewData()
             }
         }
     }
@@ -398,20 +370,7 @@ abstract class ChangeRecordBaseViewModel(
                     val new = FavouriteComment(comment = newComment)
                     favouriteCommentInteractor.add(new)
                 }
-            updateLastCommentsViewData()
-            updateFavCommentViewData()
-        }
-    }
-
-    fun onSearchCommentClick() {
-        val currentlyEnabled = searchCommentViewData.value?.enabled.orFalse()
-
-        keyboardVisibility.set(false)
-        viewModelScope.launch {
-            updateSearchCommentViewData(
-                isEnabled = !currentlyEnabled,
-                isLoading = false,
-            )
+            updateCommentsViewData()
         }
     }
 
@@ -569,8 +528,7 @@ abstract class ChangeRecordBaseViewModel(
         }
 
         // Show keyboard on comment chooser opened, hide otherwise.
-        val showKeyboard = newState is ChangeRecordChooserState.State.Comment &&
-            !searchCommentViewData.value?.enabled.orFalse()
+        val showKeyboard = newState is ChangeRecordChooserState.State.Comment
         keyboardVisibility.set(showKeyboard)
 
         chooserState.set(
@@ -896,41 +854,17 @@ abstract class ChangeRecordBaseViewModel(
         )
     }
 
-    private suspend fun updateLastCommentsViewData() {
-        lastComments.set(loadLastCommentsViewData())
-    }
-
-    private suspend fun loadLastCommentsViewData(): List<ViewHolderType> {
-        return changeRecordViewDataInteractor.getLastCommentsViewData(newTypeId)
-    }
-
-    private suspend fun updateFavCommentViewData() {
-        favCommentViewData.set(loadFavCommentViewData())
-    }
-
-    private suspend fun loadFavCommentViewData(): ChangeRecordFavCommentState {
-        return changeRecordViewDataInteractor.getFavCommentViewData(newComment)
-    }
-
-    private suspend fun updateSearchCommentViewData(
-        isLoading: Boolean,
-        isEnabled: Boolean,
-    ) {
-        val data = loadSearchCommentViewData(
-            isLoading = isLoading,
-            isEnabled = isEnabled,
-        )
-        searchCommentViewData.set(data)
+    private fun updateCommentsViewData() {
+        searchLoadJob?.cancel()
+        searchLoadJob = viewModelScope.launch {
+            comments.set(loadCommentsViewData())
+        }
     }
 
-    private suspend fun loadSearchCommentViewData(
-        isLoading: Boolean,
-        isEnabled: Boolean,
-    ): ChangeRecordSearchCommentState {
-        return changeRecordViewDataInteractor.getSearchCommentViewData(
-            isEnabled = isEnabled,
-            isLoading = isLoading,
-            search = searchComment,
+    private suspend fun loadCommentsViewData(): List<ViewHolderType> {
+        return changeRecordViewDataInteractor.getCommentsViewData(
+            comment = newComment,
+            typeId = newTypeId,
         )
     }
 
diff --git a/features/feature_change_record/src/main/res/layout/change_record_comment_field_item.xml b/features/feature_change_record/src/main/res/layout/change_record_comment_field_item.xml
index ceee643bd..afe362ac1 100644
--- a/features/feature_change_record/src/main/res/layout/change_record_comment_field_item.xml
+++ b/features/feature_change_record/src/main/res/layout/change_record_comment_field_item.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="2dp"
         android:layout_marginEnd="2dp"
-        app:layout_constraintEnd_toStartOf="@id/btnChangeRecordSearchCommentField"
+        app:layout_constraintEnd_toStartOf="@id/btnChangeRecordCommentField"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -20,34 +20,46 @@
             style="@style/EditTextMultiLine"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/records_all_search_comment" />
+            android:hint="@string/change_record_comment_hint" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
     <androidx.cardview.widget.CardView
-        android:id="@+id/btnChangeRecordSearchCommentField"
+        android:id="@+id/btnChangeRecordCommentField"
         style="@style/InputFieldCard"
         android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_marginTop="2dp"
-        app:layout_constraintDimensionRatio="h,1:1"
+        android:layout_height="0dp"
+        android:layout_marginTop="5dp"
+        app:layout_constraintBottom_toBottomOf="@id/inputChangeRecordCommentField"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="@id/inputChangeRecordCommentField">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/ButtonTimeAdjust"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="" />
+            android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/ivChangeRecordSearchCommentField"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="4dp"
-            android:background="@drawable/search"
-            android:backgroundTint="?colorSecondary"
-            android:scaleType="center" />
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/ButtonTimeAdjust"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/ivChangeRecordFavouriteComment"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_centerInParent="true"
+                android:layout_margin="4dp"
+                android:background="@drawable/star"
+                android:backgroundTint="?appInactiveColor"
+                android:scaleType="center"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintDimensionRatio="1"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.cardview.widget.CardView>
 
diff --git a/features/feature_change_record/src/main/res/layout/change_record_core_layout.xml b/features/feature_change_record/src/main/res/layout/change_record_core_layout.xml
index fadbcccae..17cef2b96 100644
--- a/features/feature_change_record/src/main/res/layout/change_record_core_layout.xml
+++ b/features/feature_change_record/src/main/res/layout/change_record_core_layout.xml
@@ -14,7 +14,7 @@
         app:layout_constraintBottom_toTopOf="@id/dividerChangeRecordButton"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0"
-        tools:visibility="visible">
+        tools:visibility="gone">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -507,134 +507,19 @@
 
     </androidx.core.widget.NestedScrollView>
 
-    <FrameLayout
-        android:id="@+id/containerChangeRecordComment"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvChangeRecordComments"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_marginHorizontal="@dimen/edit_screen_field_margin_horizontal"
+        android:layout_marginTop="12dp"
+        android:scrollbars="vertical"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@id/dividerChangeRecordButton"
         app:layout_constraintTop_toBottomOf="@id/containerChangeRecordMain"
-        tools:visibility="gone">
-
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/containerChangeRecordCommentField"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbars="vertical"
-            android:visibility="gone"
-            tools:visibility="visible">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/inputChangeRecordComment"
-                    style="@style/ChangeItemInputField"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/edit_screen_margin_horizontal"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginEnd="2dp"
-                    app:layout_constraintEnd_toStartOf="@id/btnChangeRecordSearchComment"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_goneMarginEnd="20dp">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/etChangeRecordComment"
-                        style="@style/EditTextMultiLine"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/change_record_comment_hint" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/btnChangeRecordSearchComment"
-                    style="@style/InputFieldCard"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_marginTop="2dp"
-                    android:layout_marginEnd="@dimen/edit_screen_field_margin_horizontal"
-                    app:layout_constraintDimensionRatio="h,1:1"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/inputChangeRecordComment">
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/ButtonTimeAdjust"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text="" />
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/ivChangeRecordSearchComment"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_margin="4dp"
-                        android:background="@drawable/search"
-                        android:backgroundTint="?appInactiveColor"
-                        android:scaleType="center" />
-
-                </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/btnChangeRecordFavouriteComment"
-                    style="@style/InputFieldCard"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_marginEnd="@dimen/edit_screen_field_margin_horizontal"
-                    app:layout_constraintDimensionRatio="h,1:1"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/btnChangeRecordSearchComment">
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/ButtonTimeAdjust"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:text="" />
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/ivChangeRecordFavouriteComment"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_margin="4dp"
-                        android:background="@drawable/star"
-                        android:backgroundTint="?appInactiveColor"
-                        android:scaleType="center" />
-
-                </androidx.cardview.widget.CardView>
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rvChangeRecordLastComments"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="7dp"
-                    android:nestedScrollingEnabled="false"
-                    android:overScrollMode="never"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/inputChangeRecordComment"
-                    tools:itemCount="3"
-                    tools:listitem="@layout/change_record_comment_item" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </androidx.core.widget.NestedScrollView>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rvChangeRecordSearchComments"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginHorizontal="@dimen/edit_screen_field_margin_horizontal"
-            android:layout_marginTop="12dp"
-            android:scrollbars="vertical"
-            android:visibility="gone"
-            tools:itemCount="1"
-            tools:listitem="@layout/change_record_comment_field_item"
-            tools:visibility="visible" />
-
-    </FrameLayout>
+        tools:itemCount="1"
+        tools:listitem="@layout/change_record_comment_field_item"
+        tools:visibility="visible" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvChangeRecordAction"
diff --git a/features/feature_change_running_record/src/main/java/com/example/util/simpletimetracker/feature_change_running_record/view/ChangeRunningRecordFragment.kt b/features/feature_change_running_record/src/main/java/com/example/util/simpletimetracker/feature_change_running_record/view/ChangeRunningRecordFragment.kt
index 22a1b78f9..537482b2a 100644
--- a/features/feature_change_running_record/src/main/java/com/example/util/simpletimetracker/feature_change_running_record/view/ChangeRunningRecordFragment.kt
+++ b/features/feature_change_running_record/src/main/java/com/example/util/simpletimetracker/feature_change_running_record/view/ChangeRunningRecordFragment.kt
@@ -76,9 +76,6 @@ class ChangeRunningRecordFragment :
     override fun initViewModel() = with(binding) {
         with(viewModel) {
             extra = params
-            record.observeOnce(viewLifecycleOwner) {
-                core.updateUi(layoutChangeRunningRecordCore, it.recordPreview?.comment.orEmpty())
-            }
             record.observe(::updatePreview)
             core.initViewModel(this@ChangeRunningRecordFragment, layoutChangeRunningRecordCore)
 
diff --git a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/extension/ViewExtensions.kt b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/extension/ViewExtensions.kt
index 10822115a..194b93a6a 100644
--- a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/extension/ViewExtensions.kt
+++ b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/extension/ViewExtensions.kt
@@ -176,4 +176,14 @@ fun TextView.setCompoundDrawableWithIntrinsicBounds(
     @DrawableRes bottom: Int = 0,
 ) {
     setCompoundDrawablesWithIntrinsicBounds(left, top, right, bottom)
+}
+
+inline fun <T : View> T.postDelayed(
+    delayMillis: Long,
+    crossinline action: T.() -> Unit
+) {
+    postDelayed(
+        { action() },
+        delayMillis,
+    )
 }
\ No newline at end of file
diff --git a/resources/src/main/res/values-ar/strings.xml b/resources/src/main/res/values-ar/strings.xml
index 145409ee2..49e58a79f 100644
--- a/resources/src/main/res/values-ar/strings.xml
+++ b/resources/src/main/res/values-ar/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">آخر التعليقات</string>
     <string name="change_record_favourite_comments_hint">المفضلة</string>
     <string name="change_record_favourite_comments_hint_long">التعليقات المفضلة</string>
+    <string name="change_record_similar_comments_hint">تعليقات مماثلة</string>
     <string name="change_record_categories_empty">لم تضاف وسوم متتبعة</string>
     <string name="change_record_save">حفظ</string>
     <string name="change_record_untagged">بدون وسم</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">فرز التتبعات</string>
     <string name="records_all_sort_time_started">بدأ الوقت</string>
     <string name="records_all_sort_duration">مدة</string>
-    <string name="records_all_search_comment">تعليق البحث</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">لبدء التتبع ، أضف الأنشطة بالنقر فوق الزر %s أو استخدم الإعدادات المسبقة الافتراضية بالنقر فوق الزر %s</string>
diff --git a/resources/src/main/res/values-ca/strings.xml b/resources/src/main/res/values-ca/strings.xml
index ec1abf285..dbc5f99c9 100644
--- a/resources/src/main/res/values-ca/strings.xml
+++ b/resources/src/main/res/values-ca/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Últims comentaris</string>
     <string name="change_record_favourite_comments_hint">Favorit</string>
     <string name="change_record_favourite_comments_hint_long">Comentaris preferits</string>
+    <string name="change_record_similar_comments_hint">Comentaris semblants</string>
     <string name="change_record_categories_empty">No s\'han afegit etiquetes</string>
     <string name="change_record_save">Desa</string>
     <string name="change_record_untagged">Sense etiquetar</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Endreça els enregistraments</string>
     <string name="records_all_sort_time_started">Temps d\'inici</string>
     <string name="records_all_sort_duration">Durada</string>
-    <string name="records_all_search_comment">Cerca un comentari</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">Per començar el seguiment, afegiu activitats fent clic al botó %s o utilitzeu els valors predeterminats fent clic al botó %s</string>
diff --git a/resources/src/main/res/values-de/strings.xml b/resources/src/main/res/values-de/strings.xml
index 183714229..2881f5c03 100644
--- a/resources/src/main/res/values-de/strings.xml
+++ b/resources/src/main/res/values-de/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Letzte Kommentare</string>
     <string name="change_record_favourite_comments_hint">Favorit</string>
     <string name="change_record_favourite_comments_hint_long">Lieblingskommentare</string>
+    <string name="change_record_similar_comments_hint">Ähnliche Kommentare</string>
     <string name="change_record_categories_empty">Keine Datensatz-Tags hinzugefügt</string>
     <string name="change_record_save">Speichern</string>
     <string name="change_record_untagged">Nicht markiert</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Einträge sortieren</string>
     <string name="records_all_sort_time_started">Zeit gestartet</string>
     <string name="records_all_sort_duration">Dauer</string>
-    <string name="records_all_search_comment">Kommentar suchen</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">Um mit der Verfolgung zu beginnen, fügen Sie Aktivitäten hinzu, indem Sie auf die Schaltfläche %s klicken, oder verwenden Sie Standardvoreinstellungen, indem Sie auf die Schaltfläche %s klicken</string>
diff --git a/resources/src/main/res/values-es/strings.xml b/resources/src/main/res/values-es/strings.xml
index 0d8dd4060..c854a5dde 100644
--- a/resources/src/main/res/values-es/strings.xml
+++ b/resources/src/main/res/values-es/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Últimos comentarios</string>
     <string name="change_record_favourite_comments_hint">Favorito</string>
     <string name="change_record_favourite_comments_hint_long">Comentarios favoritos</string>
+    <string name="change_record_similar_comments_hint">Comentarios similares</string>
     <string name="change_record_categories_empty">No se añadieron etiquetas</string>
     <string name="change_record_save">Guardar</string>
     <string name="change_record_untagged">Sin etiquetar</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Ordenar los registros</string>
     <string name="records_all_sort_time_started">Tiempo de inicio</string>
     <string name="records_all_sort_duration">Duración</string>
-    <string name="records_all_search_comment">Buscar comentario</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">Para comenzar a rastrear, agregue actividades haciendo clic en el botón %s o use los ajustes preestablecidos predeterminados haciendo clic en el botón %s</string>
diff --git a/resources/src/main/res/values-fa/strings.xml b/resources/src/main/res/values-fa/strings.xml
index 501a2a818..8e60536ff 100644
--- a/resources/src/main/res/values-fa/strings.xml
+++ b/resources/src/main/res/values-fa/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">نظرهای قبلی</string>
     <string name="change_record_favourite_comments_hint">مورد علاقه</string>
     <string name="change_record_favourite_comments_hint_long">نظرات مورد علاقه</string>
+    <string name="change_record_similar_comments_hint">نظرات مشابه</string>
     <string name="change_record_categories_empty">برچسب تاریخچه ای اضافه نشده</string>
     <string name="change_record_save">ذخیره</string>
     <string name="change_record_untagged">بدون برچسب</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">مرتب کردن تاریخچه ها</string>
     <string name="records_all_sort_time_started">زمان شروع</string>
     <string name="records_all_sort_duration">طول مدت</string>
-    <string name="records_all_search_comment">جستجوی نظر</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">برای شروع ردیابی، با کلیک بر روی دکمه %s فعالیت ها را اضافه کنید یا با کلیک بر روی دکمه %s از تنظیمات پیش فرض استفاده کنید</string>
diff --git a/resources/src/main/res/values-fr/strings.xml b/resources/src/main/res/values-fr/strings.xml
index 5903b3adb..c2fe744dd 100644
--- a/resources/src/main/res/values-fr/strings.xml
+++ b/resources/src/main/res/values-fr/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Derniers commentaires</string>
     <string name="change_record_favourite_comments_hint">Favoris</string>
     <string name="change_record_favourite_comments_hint_long">Commentaires favoris</string>
+    <string name="change_record_similar_comments_hint">Commentaires similaires</string>
     <string name="change_record_categories_empty">Aucune étiquette d\'enregistrement ajoutée</string>
     <string name="change_record_save">Sauvegarder</string>
     <string name="change_record_untagged">Non étiqueté</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Trier les enregistrements</string>
     <string name="records_all_sort_time_started">Heure de début</string>
     <string name="records_all_sort_duration">Durée</string>
-    <string name="records_all_search_comment">Rechercher un commentaire</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">Pour commencer le suivi, ajoutez des activités en cliquant sur le bouton %s ou utilisez les préréglages par défaut en cliquant sur le bouton %s</string>
diff --git a/resources/src/main/res/values-hi/strings.xml b/resources/src/main/res/values-hi/strings.xml
index a1367e8bc..4e92b4c84 100644
--- a/resources/src/main/res/values-hi/strings.xml
+++ b/resources/src/main/res/values-hi/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">अंतिम टिप्पणियाँ</string>
     <string name="change_record_favourite_comments_hint">पसंदीदा</string>
     <string name="change_record_favourite_comments_hint_long">पसंदीदा टिप्पणियाँ</string>
+    <string name="change_record_similar_comments_hint">समान टिप्पणियाँ</string>
     <string name="change_record_categories_empty">कोई रिकॉर्ड टैग नहीं जोड़ा गया</string>
     <string name="change_record_save">बचाना</string>
     <string name="change_record_untagged">टैग नहीं किए गए</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">क्रमबद्ध अभिलेख</string>
     <string name="records_all_sort_time_started">समय शुरू हुआ</string>
     <string name="records_all_sort_duration">अवधि</string>
-    <string name="records_all_search_comment">खोज टिप्पणी</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">ट्रैकिंग शुरू करने के लिए, %s बटन पर क्लिक करके गतिविधियाँ जोड़ें या %s बटन पर क्लिक करके डिफ़ॉल्ट प्रीसेट का उपयोग करें</string>
diff --git a/resources/src/main/res/values-in/strings.xml b/resources/src/main/res/values-in/strings.xml
index dc57256dd..3ffc1e2b8 100644
--- a/resources/src/main/res/values-in/strings.xml
+++ b/resources/src/main/res/values-in/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Komentar terakhir</string>
     <string name="change_record_favourite_comments_hint">Favorit</string>
     <string name="change_record_favourite_comments_hint_long">Komentar favorit</string>
+    <string name="change_record_similar_comments_hint">Komentar serupa</string>
     <string name="change_record_categories_empty">Tidak ada label rekaman yang ditambahkan</string>
     <string name="change_record_save">Simpan</string>
     <string name="change_record_untagged">Tidak berlabel</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Urutkan rekor</string>
     <string name="records_all_sort_time_started">Waktu dimulai</string>
     <string name="records_all_sort_duration">Durasi</string>
-    <string name="records_all_search_comment">Cari komentar</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">Untuk memulai pelacakan, tambahkan aktivitas dengan mengklik tombol %s atau gunakan preset default dengan mengklik tombol %s</string>
diff --git a/resources/src/main/res/values-it/strings.xml b/resources/src/main/res/values-it/strings.xml
index 076c7eeb6..cdb8da8b7 100644
--- a/resources/src/main/res/values-it/strings.xml
+++ b/resources/src/main/res/values-it/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Ultimi commenti</string>
     <string name="change_record_favourite_comments_hint">Preferito</string>
     <string name="change_record_favourite_comments_hint_long">Commenti preferiti</string>
+    <string name="change_record_similar_comments_hint">Commenti simili</string>
     <string name="change_record_categories_empty">Nessuna etichetta aggiunta alla registrazione</string>
     <string name="change_record_save">Salva</string>
     <string name="change_record_untagged">Non etichettato</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Ordina le registrazioni</string>
     <string name="records_all_sort_time_started">Ora di inizio</string>
     <string name="records_all_sort_duration">Durata</string>
-    <string name="records_all_search_comment">Cerca commento</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">Per avviare il tracciamento, aggiungi attività facendo clic sul pulsante %s o utilizza i preset predefiniti facendo clic sul pulsante %s</string>
diff --git a/resources/src/main/res/values-iw/strings.xml b/resources/src/main/res/values-iw/strings.xml
index 4fa3efc42..6e0df2a36 100644
--- a/resources/src/main/res/values-iw/strings.xml
+++ b/resources/src/main/res/values-iw/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">הערות אחרונות</string>
     <string name="change_record_favourite_comments_hint">מועדף</string>
     <string name="change_record_favourite_comments_hint_long">הערות אהובות</string>
+    <string name="change_record_similar_comments_hint">הערות דומות</string>
     <string name="change_record_categories_empty">לא נוספו תגיות רשומה</string>
     <string name="change_record_save">שמור</string>
     <string name="change_record_untagged">לא מתויג</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">מיין רשומות</string>
     <string name="records_all_sort_time_started">זמן התחלה</string>
     <string name="records_all_sort_duration">משך</string>
-    <string name="records_all_search_comment">חפש הערה</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">כדי להתחיל מעקב, הוסף פעילויות על ידי לחיצה על כפתור %s או השתמש בקביעות ברירת מחדל על ידי לחיצה על כפתור %s</string>
diff --git a/resources/src/main/res/values-ja/strings.xml b/resources/src/main/res/values-ja/strings.xml
index 5c34bcf95..94fcd9c84 100644
--- a/resources/src/main/res/values-ja/strings.xml
+++ b/resources/src/main/res/values-ja/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">最新コメント</string>
     <string name="change_record_favourite_comments_hint">お気に入り</string>
     <string name="change_record_favourite_comments_hint_long">お気に入りのコメント</string>
+    <string name="change_record_similar_comments_hint">同様のコメント</string>
     <string name="change_record_categories_empty">計測タグがありません</string>
     <string name="change_record_save">保存</string>
     <string name="change_record_untagged">タグを外す</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">計測記録をソート</string>
     <string name="records_all_sort_time_started">時間の開始</string>
     <string name="records_all_sort_duration">期間</string>
-    <string name="records_all_search_comment">検索コメント</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">追跡を開始するには、%s ボタンをクリックしてアクティビティを追加するか、%s ボタンをクリックしてデフォルトのプリセットを使用します。</string>
diff --git a/resources/src/main/res/values-ko/strings.xml b/resources/src/main/res/values-ko/strings.xml
index 5e530fe81..862e0df9e 100644
--- a/resources/src/main/res/values-ko/strings.xml
+++ b/resources/src/main/res/values-ko/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">이전 코멘트</string>
     <string name="change_record_favourite_comments_hint">자주쓰는 코멘트</string>
     <string name="change_record_favourite_comments_hint_long">즐겨찾는 댓글</string>
+    <string name="change_record_similar_comments_hint">비슷한 댓글</string>
     <string name="change_record_categories_empty">기록 태그 없음</string>
     <string name="change_record_save">저장</string>
     <string name="change_record_untagged">태그 없음</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">기록 정렬</string>
     <string name="records_all_sort_time_started">시작한 시간</string>
     <string name="records_all_sort_duration">기간</string>
-    <string name="records_all_search_comment">코멘트 검색</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">기록을 시작하기 위해 %s 버튼을 눌러 활동을 추가하거나 %s 버튼을 눌러 기본 템플릿을 사용하세요</string>
diff --git a/resources/src/main/res/values-nl/strings.xml b/resources/src/main/res/values-nl/strings.xml
index b2505a668..cfec9fc47 100644
--- a/resources/src/main/res/values-nl/strings.xml
+++ b/resources/src/main/res/values-nl/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Laatste opmerkingen</string>
     <string name="change_record_favourite_comments_hint">Favoriet</string>
     <string name="change_record_favourite_comments_hint_long">Favoriete opmerkingen</string>
+    <string name="change_record_similar_comments_hint">Soortgelijke opmerkingen</string>
     <string name="change_record_categories_empty">Geen opname labels toegevoegd</string>
     <string name="change_record_save">Opslaan</string>
     <string name="change_record_untagged">Niet gelabeld</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Records sorteren</string>
     <string name="records_all_sort_time_started">Tijd begonnen</string>
     <string name="records_all_sort_duration">Looptijd</string>
-    <string name="records_all_search_comment">Opmerking zoeken</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">Om het volgen te starten, voegt u activiteiten toe door op de %s-knop te klikken of gebruikt u standaardinstellingen door op de %s-knop te klikken</string>
diff --git a/resources/src/main/res/values-pl/strings.xml b/resources/src/main/res/values-pl/strings.xml
index f77f8137e..bdb370b2e 100644
--- a/resources/src/main/res/values-pl/strings.xml
+++ b/resources/src/main/res/values-pl/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Ostatni komentarz</string>
     <string name="change_record_favourite_comments_hint">Ulubione</string>
     <string name="change_record_favourite_comments_hint_long">Ulubione komentarze</string>
+    <string name="change_record_similar_comments_hint">Podobne komentarze</string>
     <string name="change_record_categories_empty">Brak dodanych tagów</string>
     <string name="change_record_save">Zapisz</string>
     <string name="change_record_untagged">Nieotagowane</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Posortuj rekordy</string>
     <string name="records_all_sort_time_started">Czas rozpoczęcia</string>
     <string name="records_all_sort_duration">Czas trwania</string>
-    <string name="records_all_search_comment">Wyszukaj komentarz</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">Aby rozpocząć śledzenie, dodaj aktywność, klikając przycisk %s lub użyj domyślnych, klikając przycisk %s</string>
diff --git a/resources/src/main/res/values-pt-rPT/strings.xml b/resources/src/main/res/values-pt-rPT/strings.xml
index 7c915fd94..61d61adef 100644
--- a/resources/src/main/res/values-pt-rPT/strings.xml
+++ b/resources/src/main/res/values-pt-rPT/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Últimos comentários</string>
     <string name="change_record_favourite_comments_hint">Favorito</string>
     <string name="change_record_favourite_comments_hint_long">Comentários favoritos</string>
+    <string name="change_record_similar_comments_hint">Comentários semelhantes</string>
     <string name="change_record_categories_empty">Nenhuma etiqueta de registo adicionada</string>
     <string name="change_record_save">Guardar</string>
     <string name="change_record_untagged">Sem etiqueta</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Organizar registos</string>
     <string name="records_all_sort_time_started">Hora de início</string>
     <string name="records_all_sort_duration">Duração</string>
-    <string name="records_all_search_comment">Pesquisar comentário</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">Para iniciar o registo, adicionar atividades clicando no botão %s ou usar as definições padrão clicando no botão %s</string>
diff --git a/resources/src/main/res/values-pt/strings.xml b/resources/src/main/res/values-pt/strings.xml
index 5a65f8725..e2ed4e56c 100644
--- a/resources/src/main/res/values-pt/strings.xml
+++ b/resources/src/main/res/values-pt/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Últimos comentários</string>
     <string name="change_record_favourite_comments_hint">Favorito</string>
     <string name="change_record_favourite_comments_hint_long">Comentários favoritos</string>
+    <string name="change_record_similar_comments_hint">Comentários semelhantes</string>
     <string name="change_record_categories_empty">Nenhuma tag de registro adicionada</string>
     <string name="change_record_save">Salvar</string>
     <string name="change_record_untagged">Sem tag</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Ordenar registros</string>
     <string name="records_all_sort_time_started">Hora de início</string>
     <string name="records_all_sort_duration">Duração</string>
-    <string name="records_all_search_comment">Pesquisar comentário</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">Para iniciar o rastreamento, adicione atividades clicando no botão %s ou use as predefinições padrão clicando no botão %s</string>
diff --git a/resources/src/main/res/values-ro/strings.xml b/resources/src/main/res/values-ro/strings.xml
index bacc1fee4..82f0dbd12 100644
--- a/resources/src/main/res/values-ro/strings.xml
+++ b/resources/src/main/res/values-ro/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Ultimele comentarii</string>
     <string name="change_record_favourite_comments_hint">Favorite</string>
     <string name="change_record_favourite_comments_hint_long">Comentarii preferate</string>
+    <string name="change_record_similar_comments_hint">Comentarii similare</string>
     <string name="change_record_categories_empty">Nu au fost adăugate etichete</string>
     <string name="change_record_save">Salvează</string>
     <string name="change_record_untagged">Ne-etichetat</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Sortează înregistrările</string>
     <string name="records_all_sort_time_started">Ora de început</string>
     <string name="records_all_sort_duration">Durata</string>
-    <string name="records_all_search_comment">Caută comentariu</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">Pentru a începe urmărirea, adaugă activitatea prin apăsarea butonului %s sau folosește setările de bază apăsând butonul %s</string>
diff --git a/resources/src/main/res/values-ru/strings.xml b/resources/src/main/res/values-ru/strings.xml
index 6a53543f2..268662089 100644
--- a/resources/src/main/res/values-ru/strings.xml
+++ b/resources/src/main/res/values-ru/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Последние комментарии</string>
     <string name="change_record_favourite_comments_hint">Избранные</string>
     <string name="change_record_favourite_comments_hint_long">Избранные комментарии</string>
+    <string name="change_record_similar_comments_hint">Похожие комментарии</string>
     <string name="change_record_categories_empty">Теги для записей не добавлены</string>
     <string name="change_record_save">Сохранить</string>
     <string name="change_record_untagged">Без тега</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Сортировка</string>
     <string name="records_all_sort_time_started">Дата</string>
     <string name="records_all_sort_duration">Продолж.</string>
-    <string name="records_all_search_comment">Поиск комментария</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">Чтобы начать отслеживание, добавьте активности нажав кнопку %s, или используйте предустановки по умолчанию нажав кнопку %s</string>
diff --git a/resources/src/main/res/values-sv/strings.xml b/resources/src/main/res/values-sv/strings.xml
index 798893263..9c8e4d378 100644
--- a/resources/src/main/res/values-sv/strings.xml
+++ b/resources/src/main/res/values-sv/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Tidigare kommentarer</string>
     <string name="change_record_favourite_comments_hint">Favorit</string>
     <string name="change_record_favourite_comments_hint_long">Favoritkommentarer</string>
+    <string name="change_record_similar_comments_hint">Liknande kommentarer</string>
     <string name="change_record_categories_empty">Ingen händelsetagg vald</string>
     <string name="change_record_save">Spara</string>
     <string name="change_record_untagged">Ej taggad</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Sortera händelser</string>
     <string name="records_all_sort_time_started">Starttid</string>
     <string name="records_all_sort_duration">Varaktighet</string>
-    <string name="records_all_search_comment">Sök kommentar</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">För att börja spåra, lägg till aktiviteter genom att klicka på %s-knappen eller använd standardförinställningar genom att klicka på %s-knappen</string>
diff --git a/resources/src/main/res/values-tr/strings.xml b/resources/src/main/res/values-tr/strings.xml
index 22b305eaf..bec45b9f2 100644
--- a/resources/src/main/res/values-tr/strings.xml
+++ b/resources/src/main/res/values-tr/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Son yorumlar</string>
     <string name="change_record_favourite_comments_hint">Favori</string>
     <string name="change_record_favourite_comments_hint_long">Favori yorumlar</string>
+    <string name="change_record_similar_comments_hint">Benzer yorumlar</string>
     <string name="change_record_categories_empty">Kayıt etiketi eklenmedi</string>
     <string name="change_record_save">Kaydet</string>
     <string name="change_record_untagged">Etiketsiz</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Kayıtları sırala</string>
     <string name="records_all_sort_time_started">Başlangıç zamanı</string>
     <string name="records_all_sort_duration">Süre</string>
-    <string name="records_all_search_comment">Yorum ara</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">İzlemeye başlamak için %s düğmesine tıklayarak etkinlikler ekleyin veya %s düğmesine tıklayarak varsayılan ön ayarları kullanın</string>
diff --git a/resources/src/main/res/values-uk/strings.xml b/resources/src/main/res/values-uk/strings.xml
index 337813666..bd6a79e93 100644
--- a/resources/src/main/res/values-uk/strings.xml
+++ b/resources/src/main/res/values-uk/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Останні коментарі</string>
     <string name="change_record_favourite_comments_hint">Обрані</string>
     <string name="change_record_favourite_comments_hint_long">Обрані коментарі</string>
+    <string name="change_record_similar_comments_hint">Подібні коментарі</string>
     <string name="change_record_categories_empty">Теги для записів не додані</string>
     <string name="change_record_save">Зберегти</string>
     <string name="change_record_untagged">Без тегу</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Сортувати записи</string>
     <string name="records_all_sort_time_started">Початок</string>
     <string name="records_all_sort_duration">Тривалість</string>
-    <string name="records_all_search_comment">Шукати коментар</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">Щоб розпочати відстеження, додайте дії, натиснувши кнопку %s, або використайте стандартні налаштування, натиснувши кнопку %s</string>
diff --git a/resources/src/main/res/values-vi/strings.xml b/resources/src/main/res/values-vi/strings.xml
index 277401f15..568743d7e 100644
--- a/resources/src/main/res/values-vi/strings.xml
+++ b/resources/src/main/res/values-vi/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Nhận xét cuối cùng</string>
     <string name="change_record_favourite_comments_hint">Yêu thích</string>
     <string name="change_record_favourite_comments_hint_long">Bình luận yêu thích</string>
+    <string name="change_record_similar_comments_hint">Nhận xét tương tự</string>
     <string name="change_record_categories_empty">Không có thẻ bản ghi nào được thêm vào</string>
     <string name="change_record_save">Lưu</string>
     <string name="change_record_untagged">Chưa gắn thẻ</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Sắp xếp bản ghi</string>
     <string name="records_all_sort_time_started">Thời gian bắt đầu</string>
     <string name="records_all_sort_duration">Thời lượng</string>
-    <string name="records_all_search_comment">Tìm kiếm nhận xét</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">Để bắt đầu theo dõi, hãy thêm hoạt động bằng cách nhấp vào nút %s hoặc sử dụng thiết đặt trước mặc định bằng cách nhấp vào nút %s</string>
diff --git a/resources/src/main/res/values-zh-rTW/strings.xml b/resources/src/main/res/values-zh-rTW/strings.xml
index f9986ff5e..c1404ecb9 100644
--- a/resources/src/main/res/values-zh-rTW/strings.xml
+++ b/resources/src/main/res/values-zh-rTW/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">最後註解</string>
     <string name="change_record_favourite_comments_hint">最喜歡的</string>
     <string name="change_record_favourite_comments_hint_long">收藏評論</string>
+    <string name="change_record_similar_comments_hint">類似評論</string>
     <string name="change_record_categories_empty">沒有新增紀錄標記</string>
     <string name="change_record_save">儲存</string>
     <string name="change_record_untagged">已取消標記</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">排序紀錄</string>
     <string name="records_all_sort_time_started">開始時間</string>
     <string name="records_all_sort_duration">期間</string>
-    <string name="records_all_search_comment">搜尋註解</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">要開始跟踪，請單擊 %s 按鈕添加活動，或單擊 %s 按鈕使用默認預設</string>
diff --git a/resources/src/main/res/values-zh/strings.xml b/resources/src/main/res/values-zh/strings.xml
index 1cb9bfba7..c67a49783 100644
--- a/resources/src/main/res/values-zh/strings.xml
+++ b/resources/src/main/res/values-zh/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">最后评论</string>
     <string name="change_record_favourite_comments_hint">最喜欢的</string>
     <string name="change_record_favourite_comments_hint_long">收藏评论</string>
+    <string name="change_record_similar_comments_hint">类似评论</string>
     <string name="change_record_categories_empty">未添加记录标签</string>
     <string name="change_record_save">保存</string>
     <string name="change_record_untagged">无标签</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">对记录排序</string>
     <string name="records_all_sort_time_started">开始时间</string>
     <string name="records_all_sort_duration">持续时间</string>
-    <string name="records_all_search_comment">搜索评论</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">要开始跟踪，请单击 %s 按钮添加活动，或单击 %s 按钮使用默认预设</string>
diff --git a/resources/src/main/res/values/strings.xml b/resources/src/main/res/values/strings.xml
index bda720059..c0d93a103 100644
--- a/resources/src/main/res/values/strings.xml
+++ b/resources/src/main/res/values/strings.xml
@@ -111,6 +111,7 @@
     <string name="change_record_last_comments_hint">Last comments</string>
     <string name="change_record_favourite_comments_hint">Favourite</string>
     <string name="change_record_favourite_comments_hint_long">Favourite comments</string>
+    <string name="change_record_similar_comments_hint">Similar comments</string>
     <string name="change_record_categories_empty">No record tags added</string>
     <string name="change_record_save">Save</string>
     <string name="change_record_untagged">Untagged</string>
@@ -238,7 +239,6 @@
     <string name="records_all_sort_order">Sort records</string>
     <string name="records_all_sort_time_started">Time started</string>
     <string name="records_all_sort_duration">Duration</string>
-    <string name="records_all_search_comment">Search comment</string>
 
     <!--  Running records  -->
     <string name="running_records_types_empty">To start tracking, add activities by clicking on %s button or use default presets by clicking on %s button</string>