diff --git a/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/DatabaseList.tsx b/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/DatabaseList.tsx
index df0c673a0f..1c1b960f06 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/DatabaseList.tsx
+++ b/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/DatabaseList.tsx
@@ -52,11 +52,11 @@ export const DatabaseList = observer(function DatabaseList({
   const placeholderMessage = isSearched ? 'ui_no_matches_placeholder' : 'connections_administration_search_database_tip';
 
   return styled(styles)(
-    <SubmittingForm onSubmit={onSearch} className={className}>
+    <SubmittingForm className={className} onSubmit={onSearch}>
       <ItemList>
-        <ItemListSearch value={hosts} placeholder={translate('connections_administration_search_database_tip')} onChange={onChange} onSearch={searchHandler} disabled={disabled}/>
+        <ItemListSearch value={hosts} placeholder={translate('connections_administration_search_database_tip')} disabled={disabled} onChange={onChange} onSearch={searchHandler} />
         {databases.map(database => (
-          <Database key={database.host + database.port} database={database} onSelect={onSelect}/>
+          <Database key={database.host + database.port} database={database} onSelect={onSelect} />
         ))}
       </ItemList>
       {!databases.length && <TextPlaceholder>{translate(placeholderMessage)}</TextPlaceholder>}
diff --git a/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/SearchDatabase.tsx b/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/SearchDatabase.tsx
index eb3c691898..f35679b1cf 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/SearchDatabase.tsx
+++ b/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/SearchDatabase.tsx
@@ -37,10 +37,10 @@ export const SearchDatabase = observer(function SearchDatabase({
       databases={databases}
       hosts={hosts}
       disabled={disabled}
+      className={className}
       onSelect={onSelect}
       onChange={onChange}
       onSearch={onSearch}
-      className={className}
     />
   );
 });
diff --git a/webapp/packages/core-di/src/DIContainer.ts b/webapp/packages/core-di/src/DIContainer.ts
index a1eb6b0fe9..c4ff6e6a60 100644
--- a/webapp/packages/core-di/src/DIContainer.ts
+++ b/webapp/packages/core-di/src/DIContainer.ts
@@ -55,7 +55,9 @@ export class DIContainer implements IServiceInjector, IServiceCollection {
     this.container.bind(Ctor).toSelf();
   }
 
-  addServiceByToken<T extends object>(token: InjectionToken<T>, value: T | IServiceConstructor<T>): void {
+  addServiceByToken<T extends Record<string, any>>(
+    token: InjectionToken<T>, value: T | IServiceConstructor<T>
+  ): void {
     if (isConstructor(value)) {
       this.container.bind(token).to(value as IServiceConstructor<T>);
     } else {