diff --git a/ajax_list.js b/ajax_list.js
index 9632527..541da9b 100644
--- a/ajax_list.js
+++ b/ajax_list.js
@@ -344,7 +344,7 @@ $=jQuery;
     
 
 })( jQuery );
-/*
+
 function pagination( begin_page, total_elements, num_elements, link ,initial_num_pages=20, variable='begin_page', label='', func_jscript='') {
     
         css_class='link_pages';
@@ -384,36 +384,63 @@ function pagination( begin_page, total_elements, num_elements, link ,initial_num
                 
         }
     
+        url_base=new URL(link);
+    
         if(initial_page>0) {
             
-            initial_link=add_get_parameters(link, **{variable: '0'});
-            middle_link=add_get_parameters(link, **{variable: str((initial_page-num_elements)) } );
+            //initial_link=add_get_parameters(link, **{variable: '0'});
+            
+            initial_url=url_base;
+            initial_url.searchParams.append(variable, '0');
+            
+            initial_link=initial_url.href;
+            
+            //middle_link=add_get_parameters(link, **{variable: str((initial_page-num_elements)) } );
+            middle_url=url_base;
+            middle_url.searchParams.append(variable, (initial_page-num_elements));
+            
+            middle_link=middle_url.href;
+            
             pages += "<a class=\""+css_class+"\" href=\""+initial_link+"\" onclick=\"${func_jscript}\">1</a> <a class=\""+css_class+"\" href=\""+middle_link+"\">&lt;&lt;</a> "
             
         }
 
-        arr_pages={}
+        arr_pages={};
 
-        #for(x=initial_page;x<last_page;x+=num_elements)
-        for x in range(initial_page, last_page, num_elements):
+        for(x=initial_page;x<last_page;x+=num_elements) {
+        //for x in range(initial_page, last_page, num_elements):
+            
+            //middle_link=add_get_parameters(link, **{variable: str(x)} )
+            middle_url=url_base;
+            middle_url.searchParams.append(variable, x);
+            
+            middle_link=middle_url.href;
             
-            middle_link=add_get_parameters(link, **{variable: str(x)} )
-
-            num_page=ceil(x/num_elements)+1;
-            arr_pages[x]="<a class=\""+css_class+"\" href=\""+middle_link+"\">"+str(num_page)+"</a> "
-            arr_pages[begin_page]='<span class="selected_page">'+str(num_page)+'</span> ';
-            pages += arr_pages[x]
 
+            num_page=Math.ceil(x/num_elements)+1;
+            arr_pages[x]="<a class=\""+css_class+"\" href=\""+middle_link+"\">"+num_page+"</a> ";
+            arr_pages[begin_page]='<span class="selected_page">'+num_page+'</span> ';
+            pages+=arr_pages[x];
+        }
         
-        if last_page<total_elements:
+        if (last_page<total_elements) {
 
-            middle_link=add_get_parameters(link, **{variable: str(x+num_elements)} );
-            last_link=add_get_parameters(link, **{variable: str( ( ( total_page*num_elements ) - num_elements) ) } )
+            middle_url=url_base;
+            middle_url.searchParams.append(variable, (initial_page-num_elements));
+            
+            middle_link=middle_url.href;
+            
+            //last_link=add_get_parameters(link, **{variable: str( ( ( total_page*num_elements ) - num_elements) ) } )
+            
+            last_url=url_base;
+            last_url.searchParams.append(variable, ( ( total_page*num_elements ) - num_elements) );
+            
+            last_link=last_url.href;
 
-            pages += "<a class=\""+css_class+"\" href=\""+middle_link+"\" onclick=\"func_jscript\">&gt;&gt;</a> <a class=\"link_pages\" href=\""+last_link+"\" onclick=\"func_jscript\">"+I18n.lang('common', 'last', 'Last')+"</a>"
+            pages += "<a class=\""+css_class+"\" href=\""+middle_link+"\" onclick=\"\">&gt;&gt;</a> <a class=\"link_pages\" href=\""+last_link+"\" onclick=\"\">Last</a>";
 
+        }
         
-        return pages
+        return pages;
     
 }
-*/