diff --git a/component_catalog/templates/component_catalog/includes/add_to.js.html b/component_catalog/templates/component_catalog/includes/add_to.js.html
index a024fe67..addd795f 100644
--- a/component_catalog/templates/component_catalog/includes/add_to.js.html
+++ b/component_catalog/templates/component_catalog/includes/add_to.js.html
@@ -4,7 +4,7 @@
     let add_to_btn_wrapper = add_to_btn.parentElement;
 
     let handle_button_display = function () {
-        let checkedCheckboxes = document.querySelectorAll('main input[type="checkbox"]:checked');
+        let checkedCheckboxes = document.querySelectorAll('#object-list-table input[type="checkbox"]:checked');
         if (checkedCheckboxes.length >= 1) {
             add_to_btn.classList.remove('disabled');
             add_to_btn_wrapper.setAttribute('data-bs-original-title', '');
@@ -15,7 +15,7 @@
     };
 
     // Adding change event listener to all checkboxes
-    document.querySelectorAll('main input[type="checkbox"]').forEach(function(checkbox) {
+    document.querySelectorAll('#object-list-table input[type="checkbox"]').forEach(function(checkbox) {
         checkbox.addEventListener('change', handle_button_display);
     });
 
@@ -27,35 +27,40 @@
         handle_button_display();
     });
 
-    $('#add-to-product-modal, #add-to-component-modal').on('show.bs.modal', function (event) {
-      // Do not include the select-all as its value is not an id we want to keep
-      let checked = $('main input[type="checkbox"]:checked').not('#checkbox-select-all');
+    document.querySelectorAll('#add-to-product-modal, #add-to-component-modal').forEach(function(modal) {
+      modal.addEventListener('show.bs.modal', function (event) {
+        // Do not include the select-all as its value is not an id we want to keep
+        let checked = Array.from(document.querySelectorAll('#object-list-table input[type="checkbox"]:checked'))
+          .filter(checkbox => checkbox.id !== 'checkbox-select-all');
 
-      if (checked.length < 1) {
-        event.preventDefault();
-        return false;
-      }
+        if (checked.length < 1) {
+          event.preventDefault();
+          return false;
+        }
 
-      let ids_input = $(this).find('#id_ids');
-      let object_repr_list = $(this).find('#object-repe-list');
+        let ids_input = modal.querySelector('#id_ids');
+        let object_repr_list = modal.querySelector('#object-repr-list');
 
-      if (ids_input) {
-        let selected_ids = [];
-        object_repr_list.html('');
+        if (ids_input) {
+          let selected_ids = [];
+          object_repr_list.innerHTML = '';
 
-        checked.each(function() {
-          selected_ids.push(this.value);
-          $('<li/>').text($(this).data('object-repr')).appendTo(object_repr_list);
-        });
+          checked.forEach(function(checkbox) {
+            selected_ids.push(checkbox.value);
+            let li = document.createElement('li');
+            li.textContent = checkbox.dataset.objectRepr;
+            object_repr_list.appendChild(li);
+          });
 
-        ids_input.val(selected_ids);
+          ids_input.value = selected_ids.join(',');
 
-        let new_component_link = $('#new-component-link');
-        if (new_component_link) {
-            let new_component_url = new_component_link.data('add-url') + '?package_ids=' + selected_ids.join();
-            new_component_link.attr('href', new_component_url);
+          let new_component_link = document.getElementById('new-component-link');
+          if (new_component_link) {
+              let new_component_url = new_component_link.dataset.addUrl + '?package_ids=' + selected_ids.join(',');
+              new_component_link.setAttribute('href', new_component_url);
+          }
         }
-      }
+      });
     });
 
     // Select all forms with id starting with "add-to-"
diff --git a/component_catalog/templates/component_catalog/includes/add_to_modal.html b/component_catalog/templates/component_catalog/includes/add_to_modal.html
index 847f1758..795d3d98 100644
--- a/component_catalog/templates/component_catalog/includes/add_to_modal.html
+++ b/component_catalog/templates/component_catalog/includes/add_to_modal.html
@@ -13,7 +13,7 @@ <h5 class="modal-title">{{ form.helper.modal_title }}</h5>
           {% if request.resolver_match.url_name|default:""|slice:"-4:" == "list" %}
             <hr>
             <h6>Selected objects:</h6>
-            <ul id="object-repe-list" style="word-break: break-word;"></ul>
+            <ul id="object-repr-list" style="word-break: break-word;"></ul>
           {% endif %}
         </div>
         <div class="modal-footer">