diff --git a/app/server/appsmith-plugins/rapidApiPlugin/src/main/java/com/external/plugins/RapidApiPlugin.java b/app/server/appsmith-plugins/rapidApiPlugin/src/main/java/com/external/plugins/RapidApiPlugin.java
index 0156cd5580..fb0c83ee6e 100644
--- a/app/server/appsmith-plugins/rapidApiPlugin/src/main/java/com/external/plugins/RapidApiPlugin.java
+++ b/app/server/appsmith-plugins/rapidApiPlugin/src/main/java/com/external/plugins/RapidApiPlugin.java
@@ -28,6 +28,8 @@ import reactor.core.publisher.Mono;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -271,7 +273,8 @@ public class RapidApiPlugin extends BasePlugin {
                     // If either the key or the value is empty, skip
                     if (queryParam.getKey() != null && !queryParam.getKey().isEmpty() &&
                             queryParam.getValue() != null && !queryParam.getValue().isEmpty()) {
-                        uriBuilder.queryParam(queryParam.getKey(), queryParam.getValue());
+                        uriBuilder.queryParam(queryParam.getKey(), URLEncoder.encode(queryParam.getValue(),
+                                StandardCharsets.UTF_8));
                     }
                 }
             }
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
index b82a9a49d9..56e76f5b6b 100644
--- a/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
+++ b/app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
@@ -28,6 +28,8 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 public class RestApiPlugin extends BasePlugin {
@@ -219,7 +221,8 @@ public class RestApiPlugin extends BasePlugin {
             if (queryParams != null) {
                 for (Property queryParam : queryParams) {
                     if (queryParam.getKey() != null && !queryParam.getKey().isEmpty()) {
-                        uriBuilder.queryParam(queryParam.getKey(), queryParam.getValue());
+                        uriBuilder.queryParam(queryParam.getKey(), URLEncoder.encode(queryParam.getValue(),
+                                StandardCharsets.UTF_8));
                     }
                 }
             }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ProviderServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ProviderServiceImpl.java
index 7f5c4623b8..f4797751c0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ProviderServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ProviderServiceImpl.java
@@ -42,7 +42,7 @@ public class ProviderServiceImpl extends BaseService<ProviderRepository, Provide
     @Override
     public Flux<Provider> get(MultiValueMap<String, String> params) {
         Provider providerExample = new Provider();
-        Sort sort = Sort.by(FieldName.NAME);
+        Sort sort = Sort.by("sortOrder");
 
         if (params.getFirst(FieldName.NAME) != null) {
             providerExample.setName(params.getFirst(FieldName.NAME));
@@ -58,6 +58,8 @@ public class ProviderServiceImpl extends BaseService<ProviderRepository, Provide
         }
         providerExample.setCategories(categories);
 
+        providerExample.setSortOrder(null);
+
         return repository.findAll(Example.of(providerExample), sort);
     }