diff --git a/packages/Webkul/Admin/src/DataGrids/OrderRefundDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderRefundDataGrid.php
index 84c028308..c99266854 100755
--- a/packages/Webkul/Admin/src/DataGrids/OrderRefundDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/OrderRefundDataGrid.php
@@ -20,7 +20,7 @@ class OrderRefundDataGrid extends DataGrid
     public function prepareQueryBuilder()
     {
         $queryBuilder = DB::table('refunds')
-                ->select('refunds.id', 'refunds.order_id', 'refunds.state', 'refunds.base_grand_total', 'refunds.created_at')
+                ->select('refunds.id', 'orders.increment_id', 'refunds.state', 'refunds.base_grand_total', 'refunds.created_at')
                 ->leftJoin('orders', 'refunds.order_id', '=', 'orders.id')
                 ->leftJoin('order_address as order_address_billing', function($leftJoin) {
                     $leftJoin->on('order_address_billing.order_id', '=', 'orders.id')
@@ -30,7 +30,7 @@ class OrderRefundDataGrid extends DataGrid
 
         $this->addFilter('billed_to', DB::raw('CONCAT(order_address_billing.first_name, " ", order_address_billing.last_name)'));
         $this->addFilter('id', 'refunds.id');
-        $this->addFilter('order_id', 'refunds.order_id');
+        $this->addFilter('increment_id', 'orders.increment_id');
         $this->addFilter('state', 'refunds.state');
         $this->addFilter('base_grand_total', 'refunds.base_grand_total');
         $this->addFilter('created_at', 'refunds.created_at');
@@ -50,7 +50,7 @@ class OrderRefundDataGrid extends DataGrid
         ]);
 
         $this->addColumn([
-            'index' => 'order_id',
+            'index' => 'increment_id',
             'label' => trans('admin::app.datagrid.order-id'),
             'type' => 'number',
             'searchable' => true,
diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php
index 16038c95e..9dfe4456d 100755
--- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php
@@ -292,6 +292,7 @@ class OrderRepository extends Repository
         $order->sub_total_refunded = $order->base_sub_total_refunded = 0;
         $order->shipping_refunded = $order->base_shipping_refunded = 0;
         $order->tax_amount_refunded = $order->base_tax_amount_refunded = 0;
+        $order->discount_refunded = $order->base_discount_refunded = 0;
         $order->grand_total_refunded = $order->base_grand_total_refunded = 0;
 
         foreach ($order->refunds as $refund) {