diff --git a/app/src/main/java/io/timelimit/android/data/model/derived/AppSpecifier.kt b/app/src/main/java/io/timelimit/android/data/model/derived/AppSpecifier.kt
index 96ea68f..610f759 100644
--- a/app/src/main/java/io/timelimit/android/data/model/derived/AppSpecifier.kt
+++ b/app/src/main/java/io/timelimit/android/data/model/derived/AppSpecifier.kt
@@ -39,11 +39,11 @@ data class AppSpecifier(val packageName: String, val activityName: String?, val
     }
 
     init {
-        if (packageName.indexOf(':') != -1 || packageName.indexOf(':') != -1) {
+        if (packageName.indexOf(':') != -1 || packageName.indexOf('@') != -1) {
             throw InvalidValueException()
         }
 
-        if (activityName != null && activityName?.indexOf('@') != -1) {
+        if (activityName != null && activityName.indexOf('@') != -1) {
             throw InvalidValueException()
         }
     }
diff --git a/app/src/main/java/io/timelimit/android/ui/manage/category/apps/add/AddCategoryAppsFragment.kt b/app/src/main/java/io/timelimit/android/ui/manage/category/apps/add/AddCategoryAppsFragment.kt
index 9b87fd5..ed748f7 100644
--- a/app/src/main/java/io/timelimit/android/ui/manage/category/apps/add/AddCategoryAppsFragment.kt
+++ b/app/src/main/java/io/timelimit/android/ui/manage/category/apps/add/AddCategoryAppsFragment.kt
@@ -166,7 +166,7 @@ class AddCategoryAppsFragment : DialogFragment() {
         binding.cancelButton.setOnClickListener { dismiss() }
 
         binding.selectAllButton.setOnClickListener {
-            adapter.selectedApps = adapter.selectedApps + (adapter.data?.map { it.packageName }?.toSet() ?: emptySet())
+            adapter.selectedApps = adapter.selectedApps + (adapter.data.map { it.packageName }.toSet())
         }
 
         adapter.listener = object: AddAppAdapterListener {
diff --git a/app/src/main/java/io/timelimit/android/ui/manage/child/apps/ChildAppsModel.kt b/app/src/main/java/io/timelimit/android/ui/manage/child/apps/ChildAppsModel.kt
index 6b1370d..0d846ec 100644
--- a/app/src/main/java/io/timelimit/android/ui/manage/child/apps/ChildAppsModel.kt
+++ b/app/src/main/java/io/timelimit/android/ui/manage/child/apps/ChildAppsModel.kt
@@ -66,7 +66,7 @@ class ChildAppsModel(application: Application): AndroidViewModel(application) {
             childCategoryAppsLive.switchMap { categoryApps ->
                 // only show items that are not device specific
                 val categoryAppByPackageName = categoryApps
-                    .filter { it.appSpecifier.deviceId == null }
+                    .filter { it.appSpecifier.activityName == null && it.appSpecifier.deviceId == null }
                     .associateBy { it.appSpecifier.packageName }
 
                 appFilterLive.ignoreUnchanged().switchMap { appFilter ->