diff --git a/plugins/packages/elasticsearch/lib/index.ts b/plugins/packages/elasticsearch/lib/index.ts
index 6b76491573..68efc8f962 100644
--- a/plugins/packages/elasticsearch/lib/index.ts
+++ b/plugins/packages/elasticsearch/lib/index.ts
@@ -57,11 +57,11 @@ export default class ElasticsearchService implements QueryService {
     return sslEnabled ? 'https' : 'http';
   }
 
-  async getConnection(sourceOptions: SourceOptions): Promise<any> {
+  async getConnection(sourceOptions: SourceOptions): Promise<Client> {
     const host = sourceOptions.host;
     const port = sourceOptions.port;
-    const username = sourceOptions.username;
-    const password = sourceOptions.password;
+    const username = encodeURIComponent(sourceOptions.username);
+    const password = encodeURIComponent(sourceOptions.password);
     const sslEnabled = sourceOptions.ssl_enabled;
     const protocol = this.determineProtocol(sourceOptions);
     const sslCertificate = sourceOptions.ssl_certificate;
diff --git a/server/src/services/app_import_export.service.ts b/server/src/services/app_import_export.service.ts
index d0966082cb..3d792d4bac 100644
--- a/server/src/services/app_import_export.service.ts
+++ b/server/src/services/app_import_export.service.ts
@@ -95,13 +95,14 @@ export class AppImportExportService {
       }
       const appVersions = await queryAppVersions.orderBy('app_versions.created_at', 'ASC').getMany();
 
-      let dataSources =
+      const legacyLocalDataSources =
         appVersions?.length &&
         (await manager
           .createQueryBuilder(DataSource, 'data_sources')
           .where('data_sources.appVersionId IN(:...versionId)', {
             versionId: appVersions.map((v) => v.id),
           })
+          .andWhere('data_sources.scope != :scope', { scope: DataSourceScopes.GLOBAL })
           .orderBy('data_sources.created_at', 'ASC')
           .getMany());
 
@@ -127,7 +128,7 @@ export class AppImportExportService {
 
       const globalDataSources = [...new Map(globalQueries.map((gq) => [gq.dataSource.id, gq.dataSource])).values()];
 
-      dataSources = [...dataSources, ...globalDataSources];
+      const dataSources = [...legacyLocalDataSources, ...globalDataSources];
 
       if (dataSources?.length) {
         dataQueries = await manager