diff --git a/var/www/Flask_server.py b/var/www/Flask_server.py
index f3f9d71a..73306ac6 100755
--- a/var/www/Flask_server.py
+++ b/var/www/Flask_server.py
@@ -351,7 +351,7 @@ def search():
     from whoosh.qparser import QueryParser
     with ix.searcher() as searcher:
         query = QueryParser("content", ix.schema).parse(" ".join(q))
-        results = searcher.search(query, limit=None)
+        results = searcher.search_page(query, 1, pagelen=20)
         for x in results:
             r.append(x.items()[0][1])
             paste = Paste.Paste(x.items()[0][1])
@@ -365,6 +365,47 @@ def search():
     return render_template("search.html", r=r, c=c, query=request.form['query'], paste_date=paste_date, paste_size=paste_size, char_to_display=max_preview_modal)
 
 
+@app.route("/get_more_search_result", methods=['POST'])
+def get_more_search_result():
+    query = request.form['query']
+    q = []
+    q.append(query)
+    offset = request.form['offset']
+
+    path_array = []
+    preview_array = []
+    date_array = []
+    size_array = []
+
+    from whoosh import index
+    from whoosh.fields import Schema, TEXT, ID
+    schema = Schema(title=TEXT(stored=True), path=ID(stored=True), content=TEXT)
+
+    indexpath = os.path.join(os.environ['AIL_HOME'], cfg.get("Indexer", "path"))
+    ix = index.open_dir(indexpath)
+    from whoosh.qparser import QueryParser
+    with ix.searcher() as searcher:
+        query = QueryParser("content", ix.schema).parse(" ".join(q))
+        results = searcher.search_page(query, offset, pagelen=20)   
+        for x in results:
+            path_array.append(x.items()[0][1])
+            paste = Paste.Paste(x.items()[0][1])
+            content = paste.get_p_content().decode('utf8', 'ignore')
+            content_range = max_preview_char if len(content)>max_preview_char else len(content)-1
+            preview_array.append(content[0:content_range])
+            curr_date = str(paste._get_p_date())
+            curr_date = curr_date[0:4]+'/'+curr_date[4:6]+'/'+curr_date[6:]
+            date_array.append(curr_date)
+            size_array.append(paste._get_p_size())
+        to_return = {}
+        to_return["path_array"] = path_array
+        to_return["preview_array"] = preview_array
+        to_return["date_array"] = date_array
+        to_return["size_array"] = size_array
+        to_return["moreData"] = False
+    return jsonify(to_return)
+
+
 @app.route("/")
 def index():
     default_minute = cfg.get("Flask", "minute_processed_paste")
diff --git a/var/www/templates/search.html b/var/www/templates/search.html
index 2616a145..8f393302 100644
--- a/var/www/templates/search.html
+++ b/var/www/templates/search.html
@@ -101,7 +101,7 @@
                                       <th>Action</th>
                                    </tr>
                               </thead>
-                              <tbody>
+                              <tbody id="table_body">
                           {% set i = 0 %}
                           {% for path in r %}
                                 <tr>
@@ -131,8 +131,39 @@
     $(document).ready(function(){
         $('[data-toggle="tooltip"]').tooltip();
         $("#button_show_path").hide();
-	$('#myTable').dataTable();
+        var search_table = $('#myTable').DataTable();
+
+        var prev_query = "{{ query }}";
+        var offset = 1;
+        load_search_data(search_table, prev_query, offset);
     });
+
+</script>
+
+<script>
+
+// Loop to recover all the data from  get_more_search_results
+// And add it dynamically top the dataTable
+
+    function load_search_data(search_table, prev_query, offset) {
+        $.post( "{{ url_for('get_more_search_result') }}", { query: prev_query, offset: offset }).done(function( data ) {
+            console.log( "Data Loaded: " )
+            console.log( data );
+
+            for(i=0; i<data.path_array.length; i++) {
+                search_table.row.add( [
+                    i+offset,
+                    data.path_array[i],
+                    data.date_array[i],
+                    data.size_array[i],
+                    data.preview_array[i]
+                ] ).draw( false );
+            }
+            if (data.moreData == true)
+                load_search_data(prev_query, offset+i);
+        });
+    }
+
 </script>
 
 <!-- Dynamically update the modal -->