diff --git a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
index 6b964475..30152de1 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
@@ -22,6 +22,7 @@ use App\Classes\ValueObjects\Constants\RemarkTypes;
 use App\Http\Resources\AddressResource;
 use App\Models\Address;
 use App\Transformers\AddressTransformer;
+use Carbon\Carbon;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -111,15 +112,23 @@ class CreateAddressLogic extends AbstractControllerLogic
             ->parseIncludes('remark')
             ->respond(200, [], JSON_PRETTY_PRINT);*/
 
+        if ($request->input('pickup_time_to') <= $request->input('pickup_time_from')) {
+            $pickupTimeFrom = Carbon::parse($request->input('pickup_time_from'));
+            $request->merge([
+                'pickup_time_to' => $pickupTimeFrom->addHour()->format('H:i') // Format to hh:mm
+            ]);
+        }
+
         $addressExtraFields = [
-            'property_type'         => $request->input('property_type'),
-            'tools_required_unload' => $request->input('tools_required_unload'),
-            'pickup_time_from'      => $request->input('pickup_time_from'),
-            'pickup_time_to'        => $request->input('pickup_time_to'),
+            'property_type'                  => $request->input('property_type'),
+            'receive_goods_working_hours'    => $request->input('receive_goods_working_hours'),
+            'receive_goods_after_hours'      => $request->input('receive_goods_after_hours'),
+            'receive_goods_on_saturday'      => $request->input('receive_goods_on_saturday'),
         ];
 
+        $address->addressExtraFields()->delete();
         $addressExtraFieldsObject = new RemarkObject(json_encode($addressExtraFields), Auth()->user()->id, RemarkTypes::ADDRESS_EXTRA_COLUMNS);
-        $this->createRemarkProcessor->execute($address, $addressExtraFieldsObject);
+        $remark = $this->createRemarkProcessor->execute($address, $addressExtraFieldsObject);
 
         return $this->resourceResponse(new AddressResource($address));
 
diff --git a/resources/assets/vue/components/orders/sections/OrderSearchSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderSearchSectionComponent.vue
index f5a57205..cacd12dd 100644
--- a/resources/assets/vue/components/orders/sections/OrderSearchSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderSearchSectionComponent.vue
@@ -37,7 +37,7 @@
         methods: {
             search() {
                 this.$store.dispatch('toggleSection', {name: 'searchOrderSection', status: true});
-                this.$store.dispatch('updateListQueue', {name: 'searchOrderListSection', filters: {reference_like:query, with_packing_lists: true}});
+                this.$store.dispatch('updateListQueue', {name: 'searchOrderListSection', filters: {reference_like:this.query, with_packing_lists: true}});
             }
         }
     }