diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
index ad07047b5..e42542e17 100644
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/BreadcrumbAdapter.kt
@@ -115,9 +115,10 @@ class BreadcrumbAdapter(val context: Context, val database: Database?)
 
                 holder.groupNumbersView?.apply {
                     if (mShowNumberEntries) {
-                        text = group.getNumberOfChildEntries(mNodeFilter.recursiveNumberOfEntries) {
-                            mNodeFilter.getFilter(node)
-                        }.toString()
+                        text = group.getNumberOfChildEntries(
+                            mNodeFilter.recursiveNumberOfEntries,
+                            mNodeFilter.filter
+                        ).toString()
                         visibility = View.VISIBLE
                     } else {
                         visibility = View.GONE
diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeFilter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeFilter.kt
index b98f44a80..7b840f760 100644
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeFilter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeFilter.kt
@@ -16,8 +16,8 @@ class NodeFilter(
     private var showExpired = PreferencesUtil.showExpiredEntries(context)
     private var showTemplate = PreferencesUtil.showTemplates(context)
 
-    fun getFilter(node: Node): Boolean {
-        return (when (node) {
+    val filter: (Node) -> Boolean = { node ->
+        when (node) {
             is Entry -> {
                 node.entryKDB?.isMetaStream() != true
             }
@@ -25,6 +25,6 @@ class NodeFilter(
                 showTemplate || database?.templatesGroup != node
             }
             else -> true
-        }) && (showExpired || !node.isCurrentlyExpires)
+        } && (showExpired || !node.isCurrentlyExpires)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
index de097797d..56d89c90b 100644
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
@@ -175,9 +175,7 @@ class NodesAdapter (
         mOldVirtualGroup = mVirtualGroup
         mVirtualGroup = group.isVirtual
         assignPreferences()
-        mNodeSortedList.replaceAll(group.getChildren { node ->
-            mNodeFilters?.getFilter(node) ?: true
-        })
+        mNodeSortedList.replaceAll(group.getChildren(mNodeFilter.filter))
     }
 
     private inner class NodeSortedListCallback: SortedListAdapterCallback<Node>(this) {
@@ -474,9 +472,10 @@ class NodesAdapter (
             if (mShowNumberEntries) {
                 holder.numberChildren?.apply {
                     text = (subNode as Group)
-                            .getNumberOfChildEntries(mNodeFilter.recursiveNumberOfEntries) {
-                                mNodeFilter.getFilter(subNode)
-                            }
+                            .getNumberOfChildEntries(
+                                mNodeFilter.recursiveNumberOfEntries,
+                                mNodeFilter.filter
+                            )
                             .toString()
                     setTextSize(mTextSizeUnit, mNumberChildrenTextDefaultDimension, mPrefSizeMultiplier)
                     visibility = View.VISIBLE