1 files changed, 5 insertions, 5 deletions
diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index d3e7312ac..37dd090d2 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -48,7 +48,7 @@
     <div class='col-md-2'>
         <div class="btn-group btn-group-sm" role="group">
             <button type='button' class="btn btn-secondary" data-toggle="modal"
-                    data-target=".table-modal-lg">
+                    data-target="#modal_grid_{{name}}">
                 {% trans "Expand table" %} <i class="fa fa-expand" aria-hidden="true"></i>
             </button>
         </div>
@@ -98,8 +98,8 @@ var query_vars = new Array({{col_idx|safe}});
 var selItems_{{sname}} = new Array();
 jQuery(document).ready(function(){
   jQuery("#search_{{name}}").click(function (){
-    if ($("#progress").length > 0){
-        $("#progress").show();
+    if ($('.modal-progress').length > 0){
+        $('.modal-progress').modal('show');
     }
     var data = "";
     for (idx in query_vars){
@@ -129,8 +129,8 @@ jQuery(document).ready(function(){
     $(".{{slug}}-csv-full").attr("href", '{{extra_source}}csv?submited=1&' + data);
     {% endfor %}
 
-    if ($("#progress").length > 0){
-        $("#progress").hide();
+    if ($('.modal-progress').length > 0){
+        $('.modal-progress').modal('hide');
     }
     return false;
   });