diff --git a/internal/models/models.go b/internal/models/models.go
index ce54994..1e3dc03 100644
--- a/internal/models/models.go
+++ b/internal/models/models.go
@@ -1,14 +1,12 @@
 package models
 
-// Pagination represents pagination information
 type Pagination struct {
-	Page       int `json:"page"`
-	Limit      int `json:"limit"`
-	Total      int64 `json:"total"`
-	TotalPages int `json:"total_pages"`
+	Page       int   `json:"page"`
+	Limit      int   `json:"limit"`
+	Total      int64 `json:"total_count"`
+	TotalPages int   `json:"total_pages"`
 }
 
-// PaginatedResponse represents a paginated response
 type PaginatedResponse[T any] struct {
 	Data       []T        `json:"data"`
 	Pagination Pagination `json:"pagination"`
diff --git a/internal/transformer/order_transformer.go b/internal/transformer/order_transformer.go
index 288cb50..73463bb 100644
--- a/internal/transformer/order_transformer.go
+++ b/internal/transformer/order_transformer.go
@@ -212,7 +212,6 @@ func ListOrdersQueryToModel(query *contract.ListOrdersQuery) *models.ListOrdersR
 		}
 	}
 
-	// Parse enum fields
 	if query.OrderType != "" {
 		orderType := constants.OrderType(query.OrderType)
 		req.OrderType = &orderType
@@ -252,7 +251,7 @@ func ListOrdersQueryToModel(query *contract.ListOrdersQuery) *models.ListOrdersR
 		}
 	}
 
-	if query.DateFrom == query.DateTo {
+	if query.DateFrom != "" && query.DateFrom == query.DateTo {
 		newDate := req.DateTo.AddDate(0, 0, 1)
 		req.DateTo = &newDate
 	}