diff --git a/emis/src/main/java/org/saudigitus/emis/data/local/repository/FormRepositoryImpl.kt b/emis/src/main/java/org/saudigitus/emis/data/local/repository/FormRepositoryImpl.kt
index 98359fe378b..19b9ae48dcc 100644
--- a/emis/src/main/java/org/saudigitus/emis/data/local/repository/FormRepositoryImpl.kt
+++ b/emis/src/main/java/org/saudigitus/emis/data/local/repository/FormRepositoryImpl.kt
@@ -106,13 +106,6 @@ class FormRepositoryImpl
         stage: String,
         dl: String,
     ) = withContext(Dispatchers.IO) {
-        d2.programModule().programTrackedEntityAttributes()
-            .byProgram().eq("")
-            .bySearchable().isTrue
-            .byDisplayInList().isTrue
-            .blockingGet()
-
-
         d2.programModule().programStageDataElements()
             .byProgramStage().eq(stage)
             .byDataElement().eq(dl)
diff --git a/emis/src/main/java/org/saudigitus/emis/ui/attendance/AttendanceScreen.kt b/emis/src/main/java/org/saudigitus/emis/ui/attendance/AttendanceScreen.kt
index c3f77337123..b099364507e 100644
--- a/emis/src/main/java/org/saudigitus/emis/ui/attendance/AttendanceScreen.kt
+++ b/emis/src/main/java/org/saudigitus/emis/ui/attendance/AttendanceScreen.kt
@@ -294,7 +294,7 @@ fun AttendanceScreen(
                                     viewModel.setAttendance(
                                         index,
                                         ou,
-                                        tei ,
+                                        tei,
                                         student.selectedEnrollment.uid().orEmpty(),
                                         value,
                                         reasonOfAbsence,
diff --git a/emis/src/main/java/org/saudigitus/emis/ui/components/Metadata.kt b/emis/src/main/java/org/saudigitus/emis/ui/components/Metadata.kt
index 47cbf28cb6a..174cd6ac19e 100644
--- a/emis/src/main/java/org/saudigitus/emis/ui/components/Metadata.kt
+++ b/emis/src/main/java/org/saudigitus/emis/ui/components/Metadata.kt
@@ -229,13 +229,8 @@ data class InfoCard(
     val isStaff: Boolean = false,
 ) {
     fun hasData(): Boolean {
-        return if (isStaff) {
-            academicYear.isNotEmpty() &&
-                orgUnitName.isNotEmpty()
-        } else {
-            grade.isNotEmpty() && section.isNotEmpty() && academicYear.isNotEmpty() &&
-                orgUnitName.isNotEmpty()
-        }
+        return academicYear.isNotEmpty() &&
+            orgUnitName.isNotEmpty()
     }
 }
 
diff --git a/emis/src/main/java/org/saudigitus/emis/ui/home/HomeUiState.kt b/emis/src/main/java/org/saudigitus/emis/ui/home/HomeUiState.kt
index b6edb6ac89c..8a7fb1301a4 100644
--- a/emis/src/main/java/org/saudigitus/emis/ui/home/HomeUiState.kt
+++ b/emis/src/main/java/org/saudigitus/emis/ui/home/HomeUiState.kt
@@ -27,26 +27,17 @@ data class HomeUiState(
     val modules: List<Module> = emptyList(),
 ) {
     val isNull: Boolean
-        get() = academicYear == null && school == null && grade == null && section == null
-
-    val isStaffFiltersNotNull: Boolean
-        get() = key == Constants.STAFF && academicYear != null && school != null
+        get() = academicYear == null && school == null
 
     val isStaff: Boolean
         get() = key == Constants.STAFF
 
     val options: List<String>
-        get() = if (key == Constants.STAFF && academicYear != null && school != null) {
-            listOf(
+        get() = if (academicYear != null && school != null) {
+            listOfNotNull(
                 academicYear.code,
                 grade?.code,
                 section?.code,
-            ).mapNotNull { it }
-        } else if (!isNull) {
-            listOf(
-                "${academicYear?.code}",
-                "${grade?.code}",
-                "${section?.code}",
             )
         } else {
             emptyList()
diff --git a/emis/src/main/java/org/saudigitus/emis/ui/home/HomeViewModel.kt b/emis/src/main/java/org/saudigitus/emis/ui/home/HomeViewModel.kt
index 4912078604c..245ea4c7ef9 100644
--- a/emis/src/main/java/org/saudigitus/emis/ui/home/HomeViewModel.kt
+++ b/emis/src/main/java/org/saudigitus/emis/ui/home/HomeViewModel.kt
@@ -130,12 +130,12 @@ class HomeViewModel
 
     private fun getTeis() {
         viewModelScope.launch {
-            if (!viewModelState.value.isNull || viewModelState.value.isStaffFiltersNotNull) {
-                val dataElements = listOf(
+            if (!viewModelState.value.isNull) {
+                val dataElements = listOfNotNull(
                     registration.value?.academicYear,
                     registration.value?.grade,
                     registration.value?.section,
-                ).mapNotNull { it }
+                )
 
                 repository.getTeisBy(
                     ou = "${viewModelState.value.school?.uid}",
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9081d183340..ee48431cf77 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ kotlin = '2.0.20'
 hilt = '2.47'
 androidxNavigation = "2.6.0"
 androidxHiltNavigation = "1.0.0"
-semis = "1.0.0"
+semis = "1.4.1"
 
 jacoco = '0.8.10'
 designSystem = "0.4.0.1"