diff --git a/src/features/Common/Input/styled.tsx b/src/features/Common/Input/styled.tsx
index 06385fd0..e80136fa 100644
--- a/src/features/Common/Input/styled.tsx
+++ b/src/features/Common/Input/styled.tsx
@@ -187,6 +187,7 @@ export const Error = styled(T9n)<ErrorProps>`
   )}
 `
 export const LabelAfter = styled.span<TitleProps>`
+  margin-left: 10px;
   font-style: normal;
   font-weight: normal;
   white-space: nowrap;
diff --git a/src/features/PlayerPage/hooks.tsx b/src/features/PlayerPage/hooks.tsx
index e569a110..e90c9e0d 100644
--- a/src/features/PlayerPage/hooks.tsx
+++ b/src/features/PlayerPage/hooks.tsx
@@ -39,6 +39,7 @@ export const usePlayerPage = () => {
       offset,
       playerId,
       sportType,
+      sub_only: true,
     }),
     [
       playerId,
diff --git a/src/pages/HighlightsPage/components/FormHighlights/hooks.tsx b/src/pages/HighlightsPage/components/FormHighlights/hooks.tsx
index 16b2028a..4b31e3e3 100644
--- a/src/pages/HighlightsPage/components/FormHighlights/hooks.tsx
+++ b/src/pages/HighlightsPage/components/FormHighlights/hooks.tsx
@@ -309,7 +309,7 @@ export const useHighlightsForm = () => {
           name: team.name_eng,
         })),
       ),
-    ), 300),
+    ), 1000),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [formState.teamValue],
   )
@@ -362,6 +362,7 @@ export const useHighlightsForm = () => {
       offset: 0,
       playerId: formState?.selectedPlayer?.id,
       sportType: formState?.sport?.id,
+      sub_only: false,
     })
       .then(({ broadcast }) => setPlayerMatches(
         broadcast.map((match: Match) => ({ ...match, isChecked: false })),
diff --git a/src/pages/HighlightsPage/components/FormHighlights/styled.tsx b/src/pages/HighlightsPage/components/FormHighlights/styled.tsx
index eeeb7a81..889a8929 100644
--- a/src/pages/HighlightsPage/components/FormHighlights/styled.tsx
+++ b/src/pages/HighlightsPage/components/FormHighlights/styled.tsx
@@ -82,26 +82,16 @@ export const ScForm = styled.form`
       `
     : ''};
 
-    .FormHighlights__input__duration {
-      & input {
-        max-width: 40px;
-      }
-    }
-
-    .FormHighlights__input__sound {
-      & input {
-        max-width: 100px;
+    & ul {
+        max-height: 200px;
       }
+    & input {
+      text-overflow: ellipsis;
     }
 
-    .FormHighlights__select__teams,
-    .FormHighlights__select__players {
-      & ul {
-        max-height: 200px;
-      }
+    .FormHighlights__input__duration {
       & input {
-        text-overflow: ellipsis;
-
+        max-width: 40px;
       }
     }
 
diff --git a/src/pages/HighlightsPage/index.tsx b/src/pages/HighlightsPage/index.tsx
index 18f4ac3d..76ce4a85 100644
--- a/src/pages/HighlightsPage/index.tsx
+++ b/src/pages/HighlightsPage/index.tsx
@@ -61,8 +61,8 @@ const HighlightsPage = () => {
         <FormHighlights price={price} />
         <MatchesHighlights />
       </ScWrapperContent>
-      <ScButtonWrap onClick={() => setIsOpenPopupChangeCard(true)}>
-        <ScButton disabled={isNotEmpty}>
+      <ScButtonWrap disabled={isNotEmpty} onClick={() => setIsOpenPopupChangeCard(true)}>
+        <ScButton>
           <T9n t='order_and_buy' />
           <ScPrice>
             {isMobileDevice ? ` | $${price}` : ''}
diff --git a/src/pages/HighlightsPage/styled.tsx b/src/pages/HighlightsPage/styled.tsx
index 3e3c23fc..d2ebfe4e 100644
--- a/src/pages/HighlightsPage/styled.tsx
+++ b/src/pages/HighlightsPage/styled.tsx
@@ -46,14 +46,14 @@ export const ScButton = styled(ButtonSolid)`
   height: 50px;
   background: #294FC4;
   border-radius: 5px;
-
-  opacity: ${({ disabled }) => (disabled ? 0.5 : 1)}
 `
 
-export const ScButtonWrap = styled.div`
+export const ScButtonWrap = styled.div<{disabled: boolean}>`
   display: flex;
   justify-content: center;
   margin-bottom: 100px;
+
+  opacity: ${({ disabled }) => (disabled ? 0.5 : 1)}
 `
 
 export const ScPrice = styled.span`
diff --git a/src/requests/getMatches/getPlayerMatches.tsx b/src/requests/getMatches/getPlayerMatches.tsx
index 6f256a35..aaa44f0b 100644
--- a/src/requests/getMatches/getPlayerMatches.tsx
+++ b/src/requests/getMatches/getPlayerMatches.tsx
@@ -15,6 +15,7 @@ type Args = {
   offset: number,
   playerId: number,
   sportType: SportTypes,
+  sub_only?: boolean,
 }
 
 export const getPlayerMatches = async ({
@@ -22,6 +23,7 @@ export const getPlayerMatches = async ({
   offset,
   playerId,
   sportType,
+  sub_only,
 }: Args): Promise<MatchesBySection> => {
   const config = {
     body: {
@@ -30,6 +32,7 @@ export const getPlayerMatches = async ({
         _p_offset: offset,
         _p_player_id: playerId,
         _p_sport: sportType,
+        _p_sub_only: sub_only,
         ...client.requests?.[proc],
       },
       proc,