diff --git a/public_html/admin/controller/api/customer/orders.php b/public_html/admin/controller/api/customer/orders.php
index 50482cb9c6..559e51e9ee 100755
--- a/public_html/admin/controller/api/customer/orders.php
+++ b/public_html/admin/controller/api/customer/orders.php
@@ -43,7 +43,16 @@ public function get() {
'sort' => 'o.date_added',
'order' => 'DESC',
'start' => 0,
+ 'limit' => 20
);
+
+ if($request['start']) {
+ $filter['start'] = (int)$request['start'];
+ }
+ if($request['limit']) {
+ $filter['limit'] = (int)$request['limit'];
+ }
+
$orders = $this->model_sale_order->getOrders($filter);
if (!count($orders)) {
$this->rest->setResponseData( array('Message' => 'No order records found for the customer') );
diff --git a/public_html/admin/view/default/template/pages/extension/extensions_store.tpl b/public_html/admin/view/default/template/pages/extension/extensions_store.tpl
index 9d8ff397e0..29d741c062 100755
--- a/public_html/admin/view/default/template/pages/extension/extensions_store.tpl
+++ b/public_html/admin/view/default/template/pages/extension/extensions_store.tpl
@@ -39,11 +39,13 @@