diff --git a/src/Form/StandardNoteFormType.php b/src/Form/StandardNoteFormType.php
index 1142550..e1fd185 100644
--- a/src/Form/StandardNoteFormType.php
+++ b/src/Form/StandardNoteFormType.php
@@ -2,14 +2,13 @@
 
 namespace App\Form;
 
-use App\Entity\Case\Member;
 use App\Entity\Case\StandardNote;
 use App\Enums\Case\NoteLocation;
 use App\Enums\Case\NoteMethod;
 use App\Enums\Case\NoteStatus;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\EnumType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -19,6 +18,11 @@ class StandardNoteFormType extends AbstractType
     {
         $members = $options['members'];
 
+        $ids = [];
+        foreach ($members as $idx => $member) {
+            $ids[$idx] = $member->getId()->toString();
+        }
+
         $builder
             ->add('date', null, [
                 'widget' => 'single_text',
@@ -42,9 +46,15 @@ class StandardNoteFormType extends AbstractType
                     'placeholder' => 'Note',
                 ],
             ])
-            ->add('members', EntityType::class, [
-                'class' => Member::class,
+            ->add('members', ChoiceType::class, [
+                //'class' => Member::class,
                 'choices' => $members,
+                'choice_attr' => function ($member) {
+                    return [
+                        'checked' => $member->isChecked(),
+                        'value' => $member->getId()->toString()
+                    ];
+                },
                 'multiple' => true,
                 'expanded' => true,
                 'choice_label' => 'name',
diff --git a/src/Form/VisitNoteFormType.php b/src/Form/VisitNoteFormType.php
index a155699..99557ba 100644
--- a/src/Form/VisitNoteFormType.php
+++ b/src/Form/VisitNoteFormType.php
@@ -8,8 +8,8 @@ use App\Enums\Case\NoteLocation;
 use App\Enums\Case\NoteMethod;
 use App\Enums\Case\NoteStatus;
 use App\Enums\Case\VisitQualityLevel;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\EnumType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -20,6 +20,11 @@ class VisitNoteFormType extends AbstractType
     {
         $members = $options['members'];
 
+        $ids = [];
+        foreach ($members as $idx => $member) {
+            $ids[$idx] = $member->getId()->toString();
+        }
+
         $builder
             ->add('date', null, [
                 'widget' => 'single_text',
@@ -58,9 +63,15 @@ class VisitNoteFormType extends AbstractType
             ->add('childFocused', EnumType::class, [
                 'class' => VisitQualityLevel::class
             ])
-            ->add('members', EntityType::class, [
-                'class' => Member::class,
+            ->add('members', ChoiceType::class, [
+                //'class' => Member::class,
                 'choices' => $members,
+                'choice_attr' => function ($member) {
+                    return [
+                        'checked' => $member->isChecked(),
+                        'value' => $member->getId()->toString()
+                    ];
+                },
                 'multiple' => true,
                 'expanded' => true,
                 'choice_label' => 'name',