diff --git a/components/LoadingTeamsForm.tsx b/components/LoadingTeamsForm.tsx
index 0bf71b0..b42c591 100644
--- a/components/LoadingTeamsForm.tsx
+++ b/components/LoadingTeamsForm.tsx
@@ -23,13 +23,13 @@ export const LoadingTeamsForm : React.FC<UserProps> = ({
   classTeam
 }) => {
 
-  const flatten = (arr) => {
+ /* const flatten = (arr) => {
     const arrOfNum = [];
     arr.split(',').forEach(str => {
       arrOfNum.push(Number(str));
     });
     return Math.min.apply(null, arrOfNum.filter(Boolean)); //Math.min(...arrOfNum);
-  }
+  }*/
   number +=1 
   return (
     <tr className="bg-white border-b dark:bg-gray-800 dark:border-gray-700">
@@ -49,7 +49,7 @@ export const LoadingTeamsForm : React.FC<UserProps> = ({
         {name_first_participant +', ' + name_second_participant}
       </td>
       <td className="px-6 py-4">
-        { flatten(classTeam)}
+        { classTeam}
       </td>
       <td className="px-6 py-4">
         { nominations}
diff --git a/pages/api/loadingLegisteredCommands.ts b/pages/api/loadingLegisteredCommands.ts
index e3afbfd..1cc97a5 100644
--- a/pages/api/loadingLegisteredCommands.ts
+++ b/pages/api/loadingLegisteredCommands.ts
@@ -1,6 +1,6 @@
 import Select from "../../server/db/select";
 
-const sql = "SELECT team_name, training_institution_team, name_team_coach, nominations, name_first_participant, name_second_participant, name_third_party, concat(first_partial_class,',',second_class,',',third_part_class) as classTeam, reg_time_add FROM members WHERE 1 ORDER BY reg_time_add DESC";
+const sql = "SELECT team_name, training_institution_team, name_team_coach, nominations, name_first_participant, name_second_participant,age_groups.name as classTeam, reg_time_add FROM members, age_groups WHERE ROUND((first_partial_class + second_class)/2) <= age_groups.class_max and ROUND((first_partial_class + second_class)/2) >= age_groups.class_min ORDER BY reg_time_add DESC"; 
 
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export default function handler(req, res)  {