diff --git a/app/controllers/avo/bulk_update_controller.rb b/app/controllers/avo/bulk_update_controller.rb
index 88f870dd4..3a819ff71 100644
--- a/app/controllers/avo/bulk_update_controller.rb
+++ b/app/controllers/avo/bulk_update_controller.rb
@@ -19,6 +19,7 @@ def handle
       if params_to_apply.blank?
         flash[:warning] = t("avo.no_changes_made")
         redirect_to after_bulk_update_path
+        return
       end
 
       updated_count, failed_records = update_records
@@ -37,51 +38,71 @@ def handle
 
     def params_to_apply
       prefilled_params = params[:prefilled] || {}
-
-      resource_key = @resource_name.downcase.to_sym
-      current_params = params[resource_key] || {}
-
-      progress_fields = @resource
-        .get_field_definitions
-        .select { |field| field.is_a?(Avo::Fields::ProgressBarField) }
-        .map(&:id)
-        .map(&:to_sym)
+      current_params = current_resource_params
+      progress_fields = progress_bar_fields
 
       current_params.reject do |key, value|
         key_sym = key.to_sym
         prefilled_value = prefilled_params[key_sym]
 
-        next true if progress_fields.include?(key_sym) && prefilled_value == "" && value.to_s == "50"
-
-        prefilled_value.to_s == value.to_s
+        progress_field_with_default?(progress_fields, key_sym, prefilled_value, value) ||
+          prefilled_value.to_s == value.to_s
       end
     end
 
+    def current_resource_params
+      resource_key = @resource_name.downcase.to_sym
+      params[resource_key] || {}
+    end
+
+    def progress_bar_fields
+      @resource.get_field_definitions
+               .select { |field| field.is_a?(Avo::Fields::ProgressBarField) }
+               .map(&:id)
+               .map(&:to_sym)
+    end
+
+    def progress_field_with_default?(progress_fields, key_sym, prefilled_value, value)
+      progress_fields.include?(key_sym) && prefilled_value == "" && value.to_s == "50"
+    end
+
     def update_records
       updated_count = 0
       failed_records = []
 
       @query.each do |record|
-        params_to_apply.each do |key, value|
-          record.public_send(:"#{key}=", value)
-        rescue => e
-          puts "Błąd przypisywania pola #{key}: #{e.message}"
-        end
-
-        @resource.fill_record(record, params)
-
+        update_record(record, params_to_apply)
         if record.save
           updated_count += 1
         else
-          failed_records << {record: record, errors: record.errors.full_messages}
+          add_failed_record(failed_records, record)
         end
       rescue => e
-        failed_records << {record: record, errors: [e.message]}
+        add_failed_record(failed_records, record, e.message)
       end
 
       [updated_count, failed_records]
     end
 
+    def update_record(record, params_to_apply)
+      params_to_apply.each do |key, value|
+        record.public_send(:"#{key}=", value)
+      rescue => e
+        log_field_assignment_error(key, e.message)
+      end
+
+      @resource.fill_record(record, params)
+    end
+
+    def log_field_assignment_error(key, error_message)
+      puts "Błąd przypisywania pola #{key}: #{error_message}"
+    end
+
+    def add_failed_record(failed_records, record, error_message = nil)
+      errors = error_message ? [error_message] : record.errors.full_messages
+      failed_records << { record: record, errors: errors }
+    end
+
     def after_bulk_update_path
       resources_path(resource: @resource)
     end
@@ -95,17 +116,21 @@ def prefill_fields(records, fields)
     end
 
     def set_query
-      if params[:query].present?
-        @query = @resource.find_record(params[:query], params: params)
-      else
-        resource_ids = action_params[:fields]&.dig(:avo_resource_ids)&.split(",") || []
-        @query = decrypted_query || (resource_ids.any? ? @resource.find_record(resource_ids, params: params) : [])
-      end
+      @query = if params[:query].present?
+                 @resource.find_record(params[:query], params: params)
+               else
+                 find_records_by_resource_ids
+               end
+    end
+
+    def find_records_by_resource_ids
+      resource_ids = action_params[:fields]&.dig(:avo_resource_ids)&.split(",") || []
+      decrypted_query || (resource_ids.any? ? @resource.find_record(resource_ids, params: params) : [])
     end
 
     def set_fields
       if @query.blank?
-        flash[:error] = "Bulk update cannot be performed without records."
+        flash[:error] = I18n.t("avo.bulk_update_no_records")
         redirect_to after_bulk_update_path
       else
         @fields = @query.first.attributes.keys.index_with { nil }
diff --git a/lib/generators/avo/templates/locales/avo.en.yml b/lib/generators/avo/templates/locales/avo.en.yml
index bd6aa6c93..71dc4cdad 100644
--- a/lib/generators/avo/templates/locales/avo.en.yml
+++ b/lib/generators/avo/templates/locales/avo.en.yml
@@ -18,6 +18,7 @@ en:
     attachment_failed: Failed to attach %{attachment_class}
     bulk_update_success: "%{count} records were successfully updated."
     bulk_update_failure: "Failed to update %{count} records. Errors: %{errors}"
+    bulk_update_no_records: Bulk update cannot be performed without records.
     cancel: Cancel
     choose_a_country: Choose a country
     choose_an_option: Choose an option