diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 9403ff625..c1cee6416 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -2,19 +2,19 @@
     <ul :class="listClasses" v-if="picked.length && displayPicked">
         <li v-for="p in picked" @click="removeEntity(p)" :key="p.type + p.id">
 <!--            todo: use translations-->
-            <span v-if="'me' === p" class="chill_denomination">utilisateur courant</span>
+            <span v-if="'me' === p" class="chill_denomination">{{ trans(USER_CURRENT_USER) }}</span>
             <span v-else class="chill_denomination">{{ p.text }}</span>
         </li>
     </ul>
     <ul class="record_actions">
-        <li>
+        <li class="btn btn-sm btn-misc">
             <label class="flex items-center gap-2">
                 <input
                     ref="itsMeCheckbox"
                     :type="multiple ? 'checkbox' : 'radio'"
                     @change="selectItsMe"
                 />
-                Utilisateur courant {{ currentUser }}
+                {{ trans(USER_CURRENT_USER) }}
             </label>
         </li>
         <li class="add-persons">
@@ -36,137 +36,69 @@
     </ul>
 </template>
 
-<script>
+<script setup>
+import { ref, computed } from 'vue';
 import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 import { appMessages } from "./i18n";
-import { trans } from "translator";
+import { trans, USER_CURRENT_USER } from "translator";
 
-export default {
-    name: "PickEntity",
-    props: {
-        multiple: {
-            type: Boolean,
-            required: true,
-        },
-        types: {
-            type: Array,
-            required: true,
-        },
-        picked: {
-            required: true,
-        },
-        uniqid: {
-            type: String,
-            required: true,
-        },
-        removableIfSet: {
-            type: Boolean,
-            default: true,
-        },
-        displayPicked: {
-            // display picked entities.
-            type: Boolean,
-            default: true,
-        },
-        suggested: {
-            type: Array,
-            default: [],
-        },
-        label: {
-            type: String,
-            required: false,
-        },
-        isCurrentUserPicker: {
-            type: Boolean,
-            default: false
-        }
-    },
-    emits: ["addNewEntity", "removeEntity", "addNewEntityProcessEnded"],
-    components: {
-        AddPersons,
-    },
-    data() {
-        return {
-            key: "",
-        };
-    },
-    computed: {
-        addPersonsOptions() {
-            return {
-                uniq: !this.multiple,
-                type: this.types,
-                priority: null,
-                button: {
-                    size: "btn-sm",
-                    class: "btn-submit",
-                },
-            };
-        },
-        translatedListOfTypes() {
-            if (this.label !== "") {
-                return this.label;
-            }
+const props = defineProps({
+    multiple: Boolean,
+    types: Array,
+    picked: Array,
+    uniqid: String,
+    removableIfSet: { type: Boolean, default: true },
+    displayPicked: { type: Boolean, default: true },
+    suggested: { type: Array, default: () => [] },
+    label: String,
+    isCurrentUserPicker: { type: Boolean, default: false }
+});
 
-            let trans = [];
-            this.types.forEach((t) => {
-                if (this.$props.multiple) {
-                    trans.push(appMessages.fr.pick_entity[t].toLowerCase());
-                } else {
-                    trans.push(
-                        appMessages.fr.pick_entity[t + "_one"].toLowerCase(),
-                    );
-                }
-            });
+const emit = defineEmits(["addNewEntity", "removeEntity", "addNewEntityProcessEnded"]);
 
-            if (this.$props.multiple) {
-                return (
-                    appMessages.fr.pick_entity.modal_title + trans.join(", ")
-                );
-            } else {
-                return (
-                    appMessages.fr.pick_entity.modal_title_one +
-                    trans.join(", ")
-                );
-            }
-        },
-        listClasses() {
-            console.log(this.isCurrentUserPicker)
-            return {
-                "list-suggest": true,
-                "remove-items": this.$props.removableIfSet,
-            };
-        },
-    },
-    methods: {
-        selectItsMe(event) {
-            if (event.target.checked) {
-                this.addNewSuggested('me')
-            } else {
-                this.removeEntity('me')
-            }
-        },
-        addNewSuggested(entity) {
-            this.$emit("addNewEntity", { entity: entity });
-        },
-        addNewEntity({ selected, modal }) {
-            selected.forEach((item) => {
-                this.$emit("addNewEntity", { entity: item.result });
-            }, this);
-            this.$refs.addPersons.resetSearch(); // to cast child method
-            modal.showModal = false;
-            this.$emit("addNewEntityProcessEnded");
-        },
-        removeEntity(entity) {
-            if (!this.$props.removableIfSet) {
-                return;
-            }
-            if ('me' === entity) {
-                if (this.$refs.itsMeCheckbox) {
-                    this.$refs.itsMeCheckbox.checked = false;
-                }
-            }
-            this.$emit("removeEntity", { entity: entity });
-        },
-    },
+const itsMeCheckbox = ref(null);
+const addPersons = ref(null);
+
+const addPersonsOptions = computed(() => ({
+    uniq: !props.multiple,
+    type: props.types,
+    priority: null,
+    button: { size: "btn-sm", class: "btn-submit" },
+}));
+
+const translatedListOfTypes = computed(() => {
+    if (props.label) return props.label;
+    let trans = props.types.map(t =>
+        props.multiple ? appMessages.fr.pick_entity[t].toLowerCase() : appMessages.fr.pick_entity[t + "_one"].toLowerCase()
+    );
+    return props.multiple ? appMessages.fr.pick_entity.modal_title + trans.join(", ") : appMessages.fr.pick_entity.modal_title_one + trans.join(", ");
+});
+
+const listClasses = computed(() => ({
+    "list-suggest": true,
+    "remove-items": props.removableIfSet,
+}));
+
+const selectItsMe = (event) => {
+    event.target.checked ? addNewSuggested('me') : removeEntity('me');
+};
+
+const addNewSuggested = (entity) => {
+    emit("addNewEntity", { entity });
+};
+
+const addNewEntity = ({ selected, modal }) => {
+    selected.forEach(item => emit("addNewEntity", { entity: item.result }));
+    addPersons.value?.resetSearch();
+    modal.showModal = false;
+    emit("addNewEntityProcessEnded");
+};
+
+const removeEntity = (entity) => {
+    if (!props.removableIfSet) return;
+    if (entity === 'me' && itsMeCheckbox.value) {
+        itsMeCheckbox.value.checked = false;
+    }
+    emit("removeEntity", { entity });
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
index 3573a9363..3f17dfe42 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
@@ -68,11 +68,8 @@ class ReferrerFilter implements FilterInterface
     {
         $builder
             ->add('accepted_referrers', PickUserOrMeDynamicType::class, [
-                'multiple' => false,
-            ])
-/*            ->add('accepted_referrers', PickUserDynamicType::class, [
                 'multiple' => true,
-            ])*/
+            ])
             ->add('date_calc', PickRollingDateType::class, [
                 'label' => 'export.filter.course.by_referrer.Computation date for referrer',
                 'required' => true,