diff --git a/src/Form/AssignmentType.php b/src/Form/AssignmentType.php
index c54316b..4f75af4 100644
--- a/src/Form/AssignmentType.php
+++ b/src/Form/AssignmentType.php
@@ -91,15 +91,22 @@ class AssignmentType extends AbstractType
             ])
             ->add('documents', CollectionType::class, [
                 'label' => 'Dokumente',
-                'entry_type' => AutocompleteEntityType::class,
+                'entry_type' => EntityType::class,
                 'entry_options' => [
                     'class' => Upload::class,
-                    'endpoint_route' => 'app_admin_autocomplete_document',
-                    'label_property' => 'originalFilename',
-                    'label_function' => function (Upload $document) {
+                    'choice_label' => function (Upload $document) {
                         return $document->getDisplayName() ?? $document->getOriginalFilename();
                     },
                     'placeholder' => 'Dokument...',
+                    'query_builder' => function (EntityRepository $repository) {
+                        return $repository
+                            ->createQueryBuilder('upload')
+                            ->where('upload.type = :type')
+                            ->setParameter('type', Upload::TYPE_DOCUMENT)
+                            ->orderBy('upload.displayName')
+                            ->addOrderBy('upload.originalFilename')
+                        ;
+                    },
                 ],
                 'allow_add' => true,
                 'allow_delete' => true,