diff --git a/src/components/Admin/resources/competition/problems/ProblemCreate.tsx b/src/components/Admin/resources/competition/problems/ProblemCreate.tsx
index 34079f67..f53e54bd 100644
--- a/src/components/Admin/resources/competition/problems/ProblemCreate.tsx
+++ b/src/components/Admin/resources/competition/problems/ProblemCreate.tsx
@@ -1,5 +1,14 @@
 import {FC} from 'react'
-import {FileInput, FormTab, ImageInput, ReferenceInput, required, SelectInput, TabbedForm, TextInput} from 'react-admin'
+import {
+  AutocompleteInput,
+  FileInput,
+  FormTab,
+  ImageInput,
+  ReferenceInput,
+  required,
+  TabbedForm,
+  TextInput,
+} from 'react-admin'
 
 import {LatexPreview} from '@/components/Admin/custom/LatexPreview'
 import {MyCreate} from '@/components/Admin/custom/MyCreate'
@@ -19,7 +28,7 @@ export const ProblemCreate: FC = () => (
     <TabbedForm>
       <FormTab label="content.labels.general">
         <ReferenceInput source="series" reference="competition/series">
-          <SelectInput fullWidth validate={required()} />
+          <AutocompleteInput optionText="verbose_name" fullWidth validate={required()} />
         </ReferenceInput>
         <TextInput source="text" multiline fullWidth validate={required()} />
         <LatexPreview source="text" />
diff --git a/src/components/Admin/resources/competition/problems/ProblemEdit.tsx b/src/components/Admin/resources/competition/problems/ProblemEdit.tsx
index ca9d2e9c..51f69cbe 100644
--- a/src/components/Admin/resources/competition/problems/ProblemEdit.tsx
+++ b/src/components/Admin/resources/competition/problems/ProblemEdit.tsx
@@ -1,5 +1,14 @@
 import {FC} from 'react'
-import {FileInput, FormTab, ImageInput, ReferenceInput, required, SelectInput, TabbedForm, TextInput} from 'react-admin'
+import {
+  AutocompleteInput,
+  FileInput,
+  FormTab,
+  ImageInput,
+  ReferenceInput,
+  required,
+  TabbedForm,
+  TextInput,
+} from 'react-admin'
 
 import {LatexPreview} from '@/components/Admin/custom/LatexPreview'
 import {MyEdit} from '@/components/Admin/custom/MyEdit'
@@ -19,7 +28,7 @@ export const ProblemEdit: FC = () => (
     <TabbedForm>
       <FormTab label="content.labels.general">
         <ReferenceInput source="series" reference="competition/series">
-          <SelectInput fullWidth validate={required()} />
+          <AutocompleteInput optionText="verbose_name" validate={required()} />
         </ReferenceInput>
         <TextInput source="text" multiline fullWidth validate={required()} />
         <LatexPreview source="text" />
diff --git a/src/components/Admin/resources/competition/series/SeriesCreate.tsx b/src/components/Admin/resources/competition/series/SeriesCreate.tsx
index 5b3ca9e0..000cde3a 100644
--- a/src/components/Admin/resources/competition/series/SeriesCreate.tsx
+++ b/src/components/Admin/resources/competition/series/SeriesCreate.tsx
@@ -1,5 +1,5 @@
 import {FC} from 'react'
-import {BooleanInput, FormTab, ReferenceInput, required, SelectInput, TabbedForm, TextInput} from 'react-admin'
+import {AutocompleteInput, FormTab, NumberInput, ReferenceInput, required, TabbedForm} from 'react-admin'
 
 import {MyCreate} from '@/components/Admin/custom/MyCreate'
 import {MyDateTimeInput} from '@/components/Admin/custom/MyDateTimeInput'
@@ -9,11 +9,10 @@ export const SeriesCreate: FC = () => (
     <TabbedForm>
       <FormTab label="content.labels.general">
         <ReferenceInput source="semester" reference="competition/semester">
-          <SelectInput fullWidth validate={required()} />
+          <AutocompleteInput optionText="verbose_name" fullWidth validate={required()} />
         </ReferenceInput>
         <MyDateTimeInput source="deadline" fullWidth validate={required()} />
-        <TextInput source="order" fullWidth validate={required()} />
-        <BooleanInput source="complete" disabled />
+        <NumberInput source="order" fullWidth validate={required()} />
       </FormTab>
     </TabbedForm>
   </MyCreate>
diff --git a/src/components/Admin/resources/competition/series/SeriesEdit.tsx b/src/components/Admin/resources/competition/series/SeriesEdit.tsx
index e49759eb..0e64586c 100644
--- a/src/components/Admin/resources/competition/series/SeriesEdit.tsx
+++ b/src/components/Admin/resources/competition/series/SeriesEdit.tsx
@@ -1,5 +1,5 @@
 import {FC} from 'react'
-import {BooleanInput, FormTab, ReferenceInput, required, SelectInput, TabbedForm, TextInput} from 'react-admin'
+import {AutocompleteInput, FormTab, NumberInput, ReferenceInput, required, TabbedForm} from 'react-admin'
 
 import {MyDateTimeInput} from '@/components/Admin/custom/MyDateTimeInput'
 import {MyEdit} from '@/components/Admin/custom/MyEdit'
@@ -16,11 +16,10 @@ export const SeriesEdit: FC = () => (
     <TabbedForm>
       <FormTab label="content.labels.general">
         <ReferenceInput source="semester" reference="competition/semester">
-          <SelectInput fullWidth validate={required()} />
+          <AutocompleteInput optionText="verbose_name" fullWidth validate={required()} />
         </ReferenceInput>
         <MyDateTimeInput source="deadline" fullWidth validate={required()} />
-        <TextInput source="order" fullWidth validate={required()} />
-        <BooleanInput source="complete" disabled />
+        <NumberInput source="order" fullWidth validate={required()} />
       </FormTab>
     </TabbedForm>
   </MyEdit>