diff --git a/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaCalibrationTest.java b/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaCalibrationTest.java
index 39883c0e1..1f682c037 100644
--- a/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaCalibrationTest.java
+++ b/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaCalibrationTest.java
@@ -6,7 +6,13 @@
 import javax.persistence.criteria.Order;
 import javax.persistence.criteria.Root;
 
-
+/**
+ * @deprecated this class have a lot of repeated code <br/>
+ * {need to be replaced and removed}<br/>
+ * use {@link com.softserve.edu.specification.sort.SortCriteria} interface instead<br/>
+ * as it used in {@link com.softserve.edu.specification.sort.AgreementSortCriteria}
+ */
+@Deprecated
 public enum SortCriteriaCalibrationTest {
     DATE() {
         public Order getSortOrder(Root<CalibrationTest> root, CriteriaBuilder cb, String sortOrder) {
diff --git a/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaCounterType.java b/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaCounterType.java
index 7eb9c678d..4d64e896d 100644
--- a/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaCounterType.java
+++ b/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaCounterType.java
@@ -6,6 +6,12 @@
 import javax.persistence.criteria.Order;
 import javax.persistence.criteria.Root;
 
+/**
+ * @deprecated this class have a lot of repeated code <br/>
+ * {need to be replaced and removed}<br/>
+ * use {@link com.softserve.edu.specification.sort.SortCriteria} interface instead<br/>
+ * as it used in {@link com.softserve.edu.specification.sort.AgreementSortCriteria}
+ */
 public enum SortCriteriaCounterType {
     ID(){
         public Order getSortOrder(Root<CounterType> root, CriteriaBuilder cb, String sortOrder) {
diff --git a/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaDeviceCategory.java b/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaDeviceCategory.java
index f9912ec1d..5136fdcb7 100644
--- a/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaDeviceCategory.java
+++ b/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaDeviceCategory.java
@@ -5,6 +5,12 @@
 import javax.persistence.criteria.Order;
 import javax.persistence.criteria.Root;
 
+/**
+ * @deprecated this class have a lot of repeated code <br/>
+ * {need to be replaced and removed}<br/>
+ * use {@link com.softserve.edu.specification.sort.SortCriteria} interface instead<br/>
+ * as it used in {@link com.softserve.edu.specification.sort.AgreementSortCriteria}
+ */
 public enum SortCriteriaDeviceCategory {
     ID() {
         public Order getSortOrder(Root<Device> root, CriteriaBuilder cb, String sortOrder) {
diff --git a/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaOrganization.java b/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaOrganization.java
index b9e616e5d..80d24db86 100644
--- a/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaOrganization.java
+++ b/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaOrganization.java
@@ -6,6 +6,12 @@
 import javax.persistence.criteria.Order;
 import javax.persistence.criteria.Root;
 
+/**
+ * @deprecated this class have a lot of repeated code <br/>
+ * {need to be replaced and removed}<br/>
+ * use {@link com.softserve.edu.specification.sort.SortCriteria} interface instead<br/>
+ * as it used in {@link com.softserve.edu.specification.sort.AgreementSortCriteria}
+ */
 public enum SortCriteriaOrganization {
     ID() {
         public Order getSortOrder(Root<Organization> root, CriteriaBuilder cb, String sortOrder) {
diff --git a/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaUser.java b/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaUser.java
index 7155ff1ab..927cc16d5 100644
--- a/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaUser.java
+++ b/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaUser.java
@@ -6,7 +6,12 @@
 import javax.persistence.criteria.Order;
 import javax.persistence.criteria.Root;
 
-
+/**
+ * @deprecated this class have a lot of repeated code <br/>
+ * {need to be replaced and removed}<br/>
+ * use {@link com.softserve.edu.specification.sort.SortCriteria} interface instead<br/>
+ * as it used in {@link com.softserve.edu.specification.sort.AgreementSortCriteria}
+ */
 public enum SortCriteriaUser {
     USERNAME() {
         public Order getSortOrder(Root<User> root, CriteriaBuilder cb, String sortOrder) {
diff --git a/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaVerification.java b/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaVerification.java
index 4be175277..dee2b43ab 100644
--- a/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaVerification.java
+++ b/service/src/main/java/com/softserve/edu/service/utils/SortCriteriaVerification.java
@@ -6,6 +6,12 @@
 import javax.persistence.criteria.Order;
 import javax.persistence.criteria.Root;
 
+/**
+ * @deprecated this class have a lot of repeated code <br/>
+ * {need to be replaced and removed}<br/>
+ * use {@link com.softserve.edu.specification.sort.SortCriteria} interface instead<br/>
+ * as it used in {@link com.softserve.edu.specification.sort.AgreementSortCriteria}
+ */
 public enum SortCriteriaVerification {
 	ID() {
 	    	public Order getSortOrder(Root<Verification> root, CriteriaBuilder cb, String sortOrder) {