diff --git a/www/admin/adminFeedback.php b/www/admin/adminFeedback.php
index d56108f2ca..4f98845086 100644
--- a/www/admin/adminFeedback.php
+++ b/www/admin/adminFeedback.php
@@ -66,6 +66,7 @@ switch ($parm['action'])
 
   case 'EMPTYBASE':
     $parm = $request->get_parms(array('sbas_id' => http_request::SANITIZE_NUMBER_INT));
+    $message = _('Base empty successful');
     try
     {
       $sbas_id = (int) $parm['sbas_id'];
@@ -73,17 +74,26 @@ switch ($parm['action'])
       $class_name = 'task_period_emptyColl';
       foreach ($databox->get_collections() as $collection)
       {
-        $settings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><tasksettings><base_id>" . $collection->get_base_id() . "</base_id></tasksettings>";
-
-        task_abstract::create($appbox, $class_name, $settings);
+        if($collection->get_record_amount() <= 500)
+        {
+          $collection->empty_collection(500);
+        }
+        else
+        {
+          $settings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><tasksettings><base_id>" . $collection->get_base_id() . "</base_id></tasksettings>";
+          task_abstract::create($appbox, $class_name, $settings);
+          $message = _('A task has been creted, please run it to complete empty collection');
+        }
       }
     }
     catch (Exception $e)
     {
-
+      $message = _('An error occurred');
     }
+    $output = p4string::jsonencode(array('message'=>$message));
     break;
   case 'EMPTYCOLL':
+    $message = _('Collection empty successful');
     $parm = $request->get_parms(
                     array(
                         "sbas_id" => http_request::SANITIZE_NUMBER_INT
@@ -95,15 +105,24 @@ switch ($parm['action'])
       $databox = databox::get_instance($parm['sbas_id']);
       $collection = collection::get_from_coll_id($databox, $parm['coll_id']);
 
-      $class_name = 'task_period_emptyColl';
-      $settings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<tasksettings>\n<base_id>" . $collection->get_base_id() . "</base_id></tasksettings>";
+      if($collection->get_record_amount() <= 500)
+      {
+        $collection->empty_collection(500);
+      }
+      else
+      {
+        $class_name = 'task_period_emptyColl';
+        $settings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<tasksettings>\n<base_id>" . $collection->get_base_id() . "</base_id></tasksettings>";
 
-      task_abstract::create($appbox, $class_name, $settings);
+        task_abstract::create($appbox, $class_name, $settings);
+        $message = _('A task has been creted, please run it to complete empty collection');
+      }
     }
     catch (Exception $e)
     {
-
+      $message = _('An error occurred');
     }
+    $output = p4string::jsonencode(array('message'=>$message));
     break;
 
   case 'SETTASKSTATUS':
diff --git a/www/admin/collection.php b/www/admin/collection.php
index a1c3a92c6b..3451e712fc 100644
--- a/www/admin/collection.php
+++ b/www/admin/collection.php
@@ -291,6 +291,7 @@ phrasea::headers();
 
             },
             success: function(data){
+              alert(data.message);
               return;
             }
           });
diff --git a/www/admin/database.php b/www/admin/database.php
index 1378be8dd3..64c590f868 100644
--- a/www/admin/database.php
+++ b/www/admin/database.php
@@ -194,6 +194,7 @@ if ($parm['act'])
         dataType: 'json',
         data: { sbas_id:<?php echo $sbas_id ?>  },
         success: function(data){
+          alert(data.message);
         }
       });
     }