diff --git a/src/main/java/redis/clients/jedis/search/schemafields/TagField.java b/src/main/java/redis/clients/jedis/search/schemafields/TagField.java
index 044f9d75f6..407c4dbddc 100644
--- a/src/main/java/redis/clients/jedis/search/schemafields/TagField.java
+++ b/src/main/java/redis/clients/jedis/search/schemafields/TagField.java
@@ -106,6 +106,14 @@ public void addParams(CommandArguments args) {
       args.add(SEPARATOR).add(separator);
     }
 
+    if (caseSensitive) {
+      args.add(CASESENSITIVE);
+    }
+
+    if (withSuffixTrie) {
+      args.add(WITHSUFFIXTRIE);
+    }
+
     if (sortableUNF) {
       args.add(SORTABLE).add(UNF);
     } else if (sortable) {
@@ -115,13 +123,5 @@ public void addParams(CommandArguments args) {
     if (noIndex) {
       args.add(NOINDEX);
     }
-
-    if (caseSensitive) {
-      args.add(CASESENSITIVE);
-    }
-
-    if (withSuffixTrie) {
-      args.add(WITHSUFFIXTRIE);
-    }
   }
 }
diff --git a/src/main/java/redis/clients/jedis/search/schemafields/TextField.java b/src/main/java/redis/clients/jedis/search/schemafields/TextField.java
index f7967383c7..573cae90a3 100644
--- a/src/main/java/redis/clients/jedis/search/schemafields/TextField.java
+++ b/src/main/java/redis/clients/jedis/search/schemafields/TextField.java
@@ -107,29 +107,30 @@ public void addParams(CommandArguments args) {
     args.addParams(fieldName);
     args.add(TEXT);
 
-    if (sortableUNF) {
-      args.add(SORTABLE).add(UNF);
-    } else if (sortable) {
-      args.add(SORTABLE);
+    if (weight != null) {
+      args.add(WEIGHT).add(weight);
     }
 
     if (noStem) {
       args.add(NOSTEM);
     }
-    if (noIndex) {
-      args.add(NOINDEX);
-    }
 
     if (phoneticMatcher != null) {
       args.add(PHONETIC).add(phoneticMatcher);
     }
 
-    if (weight != null) {
-      args.add(WEIGHT).add(weight);
-    }
-
     if (withSuffixTrie) {
       args.add(WITHSUFFIXTRIE);
     }
+
+    if (sortableUNF) {
+      args.add(SORTABLE).add(UNF);
+    } else if (sortable) {
+      args.add(SORTABLE);
+    }
+
+    if (noIndex) {
+      args.add(NOINDEX);
+    }
   }
 }