diff --git a/classes/associationservice.php b/classes/associationservice.php
index 488520e..fe471f6 100644
--- a/classes/associationservice.php
+++ b/classes/associationservice.php
@@ -161,7 +161,7 @@ class associationservice extends \external_api {
 
         $params = ["pattern_nm" => $pattern, "pattern_id" => $pattern, ];
 
-        $sql = "SELECT c.* from {cohort} c LEFT JOIN {local_treestudyplan_cohort} j ON c.id = j.cohort_id
+        $sql = "SELECT DISTINCT c.* from {cohort} c LEFT JOIN {local_treestudyplan_cohort} j ON c.id = j.cohort_id
                 WHERE c.visible = 1 AND(name LIKE :pattern_nm OR idnumber LIKE :pattern_id)";
         if (isset($excludeid) && is_numeric($excludeid)) {
             $sql .= " AND  (j.studyplan_id IS NULL OR j.studyplan_id != :exclude_id)";
@@ -220,7 +220,7 @@ class associationservice extends \external_api {
                    "pattern_ln" => $pattern,
                    "pattern_un" => $pattern,
                   ];
-        $sql = "SELECT u.* from {user} u LEFT JOIN {local_treestudyplan_user} j ON u.id = j.user_id
+        $sql = "SELECT DISTINCT u.* from {user} u LEFT JOIN {local_treestudyplan_user} j ON u.id = j.user_id
                 WHERE u.deleted != 1 AND (firstname LIKE :pattern_fn OR lastname LIKE :pattern_ln OR username LIKE :pattern_un)";
         if (isset($excludeid) && is_numeric($excludeid)) {
             $sql .= " AND  (j.studyplan_id IS NULL OR j.studyplan_id != :exclude_id)";
diff --git a/edit-plan.php b/edit-plan.php
index 45de976..b61d6fa 100644
--- a/edit-plan.php
+++ b/edit-plan.php
@@ -106,10 +106,10 @@ print $OUTPUT->header();
         </div>
     </div>
     <div v-cloak>
-        <div v-if='!activestudyplan && usedcontexts' class='ml-3 mb-3'>
+        <div v-if='!activestudyplan && usedcontexts' class='ml-3 mb-3 s-context-selector'>
             <b-form-select text='<?php print($contextname);?>' :value="contextid" @change='switchContext'>
                 <b-form-select-option v-for='ctx in usedcontexts' :key='ctx.id' :value="ctx.context_id"
-                    :class="(ctx.studyplancount > 0) ? 'font-weight-bold' : '' + (ctx.context_id == contextid)?' active':''"
+                    :class="(ctx.studyplancount > 0) ? 'font-weight-bold' : ''"
                 ><span v-for="(p, i) in ctx.category.path"
                     ><span v-if="i>0"> / </span>{{ p }}</span> <span>({{ ctx.studyplancount }})</span>
                 </b-form-select-option>
diff --git a/scss/studyplancard.scss b/scss/studyplancard.scss
index daea3ec..2b5e065 100644
--- a/scss/studyplancard.scss
+++ b/scss/studyplancard.scss
@@ -156,8 +156,5 @@
             }
 
         }
-
     }
-
-
 }
\ No newline at end of file
diff --git a/view-plan.php b/view-plan.php
index f9235b3..d4fb33b 100644
--- a/view-plan.php
+++ b/view-plan.php
@@ -103,10 +103,10 @@ print $OUTPUT->header();
         </div>
     </div>
     <div v-cloak>
-        <div v-if='!activestudyplan && usedcontexts' class='ml-3 mb-3'>
+        <div v-if='!activestudyplan && usedcontexts' class='ml-3 mb-3 s-context-selector'>
             <b-form-select text='<?php print($contextname);?>' :value="contextid" @change='switchContext'>
                 <b-form-select-option v-for='ctx in usedcontexts' :key='ctx.id' :value="ctx.context_id" 
-                    :class="(ctx.studyplancount > 0) ? 'font-weight-bold' : '' + (ctx.context_id == contextid)?' active':''"
+                    :class="(ctx.studyplancount > 0) ? 'font-weight-bold' : ''"
                 ><span v-for="(p, i) in ctx.category.path"><span v-if="i>0"> / </span>{{ p }}</span>
                  <span>({{ ctx.studyplancount }})</span></b-form-select-option>
             </b-form-select>