diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt b/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt
index f4c8df0e..28438e81 100644
--- a/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt
+++ b/feature/src/main/java/com/terning/feature/filtering/filteringone/FilteringOneRoute.kt
@@ -58,10 +58,12 @@ fun FilteringOneRoute(
     FilteringOneScreen(
         name = name,
         onButtonClick = { grade ->
-            if (grade.isNotEmpty()) {
-                viewModel.updateGrade(grade)
-                viewModel.updateButton(true)
-            } else viewModel.updateButton(false)
+            with(viewModel) {
+                if (grade.isNotEmpty()) {
+                    updateGrade(grade)
+                    updateButton(true)
+                } else updateButton(false)
+            }
         },
         onNextClick = viewModel::navigateToFilteringTwo,
         navigateUp = viewModel::navigateUp,
diff --git a/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt b/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt
index 53f72278..facee419 100644
--- a/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt
+++ b/feature/src/main/java/com/terning/feature/filtering/filteringtwo/FilteringTwoRoute.kt
@@ -63,10 +63,12 @@ fun FilteringTwoRoute(
         onNextClick = viewModel::navigateToFilteringThree,
         navigateUp = viewModel::navigateUp,
         onButtonClick = { workingPeriod ->
-            if (workingPeriod.isNotEmpty()) {
-                viewModel.updateWorkingPeriod(workingPeriod)
-                viewModel.updateButton(true)
-            } else viewModel.updateButton(false)
+            with(viewModel) {
+                if (workingPeriod.isNotEmpty()) {
+                    updateWorkingPeriod(workingPeriod)
+                    updateButton(true)
+                } else updateButton(false)
+            }
         },
         buttonState = state.isButtonValid,
         workingPeriod = state.workingPeriod,