diff --git a/lib/pages/CyclePages/cycle_result_screen.dart b/lib/pages/CyclePages/cycle_result_screen.dart
index 121f70c..d0558c3 100755
--- a/lib/pages/CyclePages/cycle_result_screen.dart
+++ b/lib/pages/CyclePages/cycle_result_screen.dart
@@ -199,7 +199,7 @@ class _CycleResultScreenState extends State<CycleResultScreen> {
                                         ),
                                       )
                                     :
-                                cycleResults.items?.length != null ?
+                                cycleResults.items?.length != 0 ?
                                 ListView.builder(
                                         controller: sc,
                                         itemBuilder: (context, index) {
diff --git a/lib/pages/ItemPages/item_result_screen.dart b/lib/pages/ItemPages/item_result_screen.dart
index 344266e..5a3657a 100755
--- a/lib/pages/ItemPages/item_result_screen.dart
+++ b/lib/pages/ItemPages/item_result_screen.dart
@@ -251,7 +251,7 @@ class _ItemResultScreenState extends State<ItemResultScreen> {
                                           color: Colors.black,
                                         ),
                                       )
-                                    : itemResults.items?.length != null ?
+                                    : itemResults.items?.length != 0 ?
                                 ListView.builder(
                                         controller: sc,
                                         itemBuilder: (context, index) {
diff --git a/lib/pages/LabelPages/label_result_screen.dart b/lib/pages/LabelPages/label_result_screen.dart
index 8a7bb22..ba7338e 100755
--- a/lib/pages/LabelPages/label_result_screen.dart
+++ b/lib/pages/LabelPages/label_result_screen.dart
@@ -176,7 +176,7 @@ class _LabelResultScreenState extends State<LabelResultScreen> {
                                           color: Colors.black,
                                         ),
                                       )
-                                    : labelResults.items?.length != null
+                                    : labelResults.items?.length != 0
                                         ? ListView.builder(
                                             controller: sc,
                                             itemBuilder: (context, index) =>
diff --git a/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart b/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart
index 5150eef..898e39a 100755
--- a/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart
+++ b/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart
@@ -175,7 +175,7 @@ class _MyItemsMineScreenState extends State<MyItemsMineScreen> {
                                     color: Colors.black,
                                   ),
                                 )
-                              : itemResults.originalMyItems?.length != null
+                              : itemResults.myItems?.length != 0
                                   ? ListView.builder(
                                       controller: sc,
                                       itemBuilder: (context, index) {
diff --git a/lib/pages/MyItemsPages/Result/my_items_requests_screen.dart b/lib/pages/MyItemsPages/Result/my_items_requests_screen.dart
index 26e0d62..5f9be06 100755
--- a/lib/pages/MyItemsPages/Result/my_items_requests_screen.dart
+++ b/lib/pages/MyItemsPages/Result/my_items_requests_screen.dart
@@ -94,7 +94,7 @@ class _MyItemsRequestsScreenState extends State<MyItemsRequestsScreen> {
                                     color: Colors.black,
                                   ),
                                 )
-                              : itemResults.myItems?.length != null
+                              : itemResults.originalMyItemsRequests?.length != 0
                                   ? ListView.builder(
                                       controller: sc,
                                       itemBuilder: (context, index) {
diff --git a/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart b/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart
index 63280e3..cf80ccf 100755
--- a/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart
+++ b/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart
@@ -146,8 +146,8 @@ class _MyPackagesMineScreenState extends State<MyPackagesMineScreen> {
                                     color: Colors.black,
                                   ),
                                 )
-                              : packageResults.originalMyPackages?.length !=
-                                      null
+                              : packageResults.myPackages?.length !=
+                                      0
                                   ? ListView.builder(
                                       controller: sc,
                                       itemBuilder: (context, index) {
diff --git a/lib/pages/MyPackagesPages/Result/my_packages_requests_screen.dart b/lib/pages/MyPackagesPages/Result/my_packages_requests_screen.dart
index 2b380e3..2dc8a82 100755
--- a/lib/pages/MyPackagesPages/Result/my_packages_requests_screen.dart
+++ b/lib/pages/MyPackagesPages/Result/my_packages_requests_screen.dart
@@ -94,7 +94,7 @@ class _MyPackagesRequestsScreenState extends State<MyPackagesRequestsScreen> {
                                     color: Colors.black,
                                   ),
                                 )
-                              : packageResults.myPackages?.length != null
+                              : packageResults.originalMyPackagesRequests?.length != 0
                                   ? ListView.builder(
                                       controller: sc,
                                       itemBuilder: (context, index) {
diff --git a/lib/pages/PackagePages/package_result_screen.dart b/lib/pages/PackagePages/package_result_screen.dart
index b74fb04..af1c1e9 100755
--- a/lib/pages/PackagePages/package_result_screen.dart
+++ b/lib/pages/PackagePages/package_result_screen.dart
@@ -216,7 +216,7 @@ class _PackageResultScreenState extends State<PackageResultScreen> {
                                         color: Colors.black,
                                       ),
                                     )
-                                  : packageResults.items?.length != null
+                                  : packageResults.items?.length != 0
                                       ? ListView.builder(
                                           controller: sc,
                                           itemBuilder: (context, index) {
diff --git a/lib/pages/TestPages/test_result_screen.dart b/lib/pages/TestPages/test_result_screen.dart
index e3811f1..f000a6a 100755
--- a/lib/pages/TestPages/test_result_screen.dart
+++ b/lib/pages/TestPages/test_result_screen.dart
@@ -278,7 +278,7 @@ class _TestResultScreenState extends State<TestResultScreen> {
                                           color: Colors.black,
                                         ),
                                       )
-                                    : testResults.items?.length != null
+                                    : testResults.items?.length != 0
                                         ? ListView.builder(
                                             controller: sc,
                                             itemBuilder: (context, index) =>
diff --git a/lib/pages/TestPages/test_verify_screen.dart b/lib/pages/TestPages/test_verify_screen.dart
index f7be2c6..5e3b5ab 100755
--- a/lib/pages/TestPages/test_verify_screen.dart
+++ b/lib/pages/TestPages/test_verify_screen.dart
@@ -236,7 +236,7 @@ class _TestVerifyScreenState extends State<TestVerifyScreen> {
                               color: Colors.black,
                             ),
                           )
-                        : testResults.items?.length != null
+                        : testResults.items?.length != 0
                             ? ListView.builder(
                                 controller: sc,
                                 itemBuilder: (context, index) =>