diff --git a/lib/loan/ui/pages/loan_group_page/add_edit_button.dart b/lib/loan/ui/pages/loan_group_page/add_edit_button.dart
index 1fd8bc279..94341e70b 100644
--- a/lib/loan/ui/pages/loan_group_page/add_edit_button.dart
+++ b/lib/loan/ui/pages/loan_group_page/add_edit_button.dart
@@ -63,21 +63,6 @@ class AddEditButton extends HookConsumerWidget {
             await items.when(
               data: (itemList) async {
                 await tokenExpireWrapper(ref, () async {
-                  final sortedAvailable = itemList
-                      .where(
-                        (element) =>
-                            element.loanedQuantity < element.totalQuantity,
-                      )
-                      .toList()
-                    ..sort((a, b) => a.name.compareTo(b.name));
-                  final sortedUnavailable = itemList
-                      .where(
-                        (element) =>
-                            element.loanedQuantity >= element.totalQuantity,
-                      )
-                      .toList()
-                    ..sort((a, b) => a.name.compareTo(b.name));
-                  itemList = sortedAvailable + sortedUnavailable;
                   List<ItemQuantity> selected = itemList
                       .where(
                         (element) =>
diff --git a/lib/loan/ui/pages/loan_group_page/add_edit_loan_page.dart b/lib/loan/ui/pages/loan_group_page/add_edit_loan_page.dart
index e631d5fe0..7456ca300 100644
--- a/lib/loan/ui/pages/loan_group_page/add_edit_loan_page.dart
+++ b/lib/loan/ui/pages/loan_group_page/add_edit_loan_page.dart
@@ -91,7 +91,7 @@ class AddEditLoanPage extends HookConsumerWidget {
                           }
                         });
                       },
-                      canBeEmpty: true,
+                      canBeEmpty: false,
                       controller: queryController,
                     ),
                     const SizedBox(height: 10),
@@ -104,11 +104,13 @@ class AddEditLoanPage extends HookConsumerWidget {
                     TextEntry(
                       label: LoanTextConstants.note,
                       controller: note,
+                      canBeEmpty: true,
                     ),
                     const SizedBox(height: 30),
                     TextEntry(
                       label: LoanTextConstants.caution,
                       controller: caution,
+                      canBeEmpty: true,
                     ),
                     const SizedBox(height: 50),
                     AddEditButton(
diff --git a/lib/loan/ui/pages/loan_group_page/item_bar.dart b/lib/loan/ui/pages/loan_group_page/item_bar.dart
index 6bb8acb36..61089a6ad 100644
--- a/lib/loan/ui/pages/loan_group_page/item_bar.dart
+++ b/lib/loan/ui/pages/loan_group_page/item_bar.dart
@@ -35,19 +35,6 @@ class ItemBar extends HookConsumerWidget {
         value: itemListForSelected,
         loaderColor: ColorConstants.background2,
         builder: (context, data) {
-          final sortedAvailableData = data
-              .where(
-                (element) => element.loanedQuantity < element.totalQuantity,
-              )
-              .toList()
-            ..sort((a, b) => a.name.compareTo(b.name));
-          final sortedUnavailableData = data
-              .where(
-                (element) => element.loanedQuantity >= element.totalQuantity,
-              )
-              .toList()
-            ..sort((a, b) => a.name.compareTo(b.name));
-          data = sortedAvailableData + sortedUnavailableData;
           if (loanersItems[loaner] == null) {
             return const SizedBox(
               height: 180,
@@ -80,20 +67,6 @@ class ItemBar extends HookConsumerWidget {
                   ),
                 );
               }
-              final sortedAvailable = itemList
-                  .where(
-                    (element) => element.loanedQuantity < element.totalQuantity,
-                  )
-                  .toList()
-                ..sort((a, b) => a.name.compareTo(b.name));
-              final sortedUnavailable = itemList
-                  .where(
-                    (element) =>
-                        element.loanedQuantity >= element.totalQuantity,
-                  )
-                  .toList()
-                ..sort((a, b) => a.name.compareTo(b.name));
-              itemList = sortedAvailable + sortedUnavailable;
               return HorizontalListView.builder(
                 height: 180,
                 items: itemList,
diff --git a/lib/loan/ui/pages/loan_group_page/start_date_entry.dart b/lib/loan/ui/pages/loan_group_page/start_date_entry.dart
index fe21e2f03..1dd6194cc 100644
--- a/lib/loan/ui/pages/loan_group_page/start_date_entry.dart
+++ b/lib/loan/ui/pages/loan_group_page/start_date_entry.dart
@@ -29,19 +29,6 @@ class StartDateEntry extends HookConsumerWidget {
         (date) {
           startNotifier.setStart(date);
           items.whenData((itemList) {
-            final sortedAvailable = itemList
-                .where(
-                  (element) => element.loanedQuantity < element.totalQuantity,
-                )
-                .toList()
-              ..sort((a, b) => a.name.compareTo(b.name));
-            final sortedUnavailable = itemList
-                .where(
-                  (element) => element.loanedQuantity >= element.totalQuantity,
-                )
-                .toList()
-              ..sort((a, b) => a.name.compareTo(b.name));
-            itemList = sortedAvailable + sortedUnavailable;
             List<Item> selected = itemList
                 .where(
                   (element) => selectedItems[itemList.indexOf(element)] != 0,