diff --git a/src/components/TagEditor.tsx b/src/components/TagEditor.tsx
index bc49359..64b8a7c 100644
--- a/src/components/TagEditor.tsx
+++ b/src/components/TagEditor.tsx
@@ -1,6 +1,7 @@
 import { Select, createOptions } from "@thisbeyond/solid-select";
 import "~/styles/solid-select.css"
 import { SmallHeader } from "./layout";
+import { For } from "solid-js";
 
 // take two arrays, subtract the second from the first, then return the first
 function subtract<T>(a: T[], b: T[]) {
@@ -45,20 +46,19 @@ export function TagEditor(props: { title: string, values: TagItem[], setValues:
             <SmallHeader>{props.title}</SmallHeader>
             <Select
                 multiple
+                initialValue={props.selectedValues}
                 onChange={onChange}
                 placeholder="Where's it coming from?"
                 {...selectProps}
             />
-
-            {/* TODO: blocked on https://github.com/thisbeyond/solid-select/issues/39 */}
-            {/* <div class="flex gap-2 flex-wrap">
+            <div class="flex gap-2 flex-wrap">
                 <For each={subtract(props.values, props.selectedValues).slice(0, 3)}>
                     {(contact) => (
-                        <div onClick={() => onChange([...props.selectedValues, contact])} class="bg-m-blue/50 px-1 py-[0.5] rounded cursor-pointer hover:outline-white hover:outline-1">{contact.name}</div>
+                        <div onClick={() => onChange([...props.selectedValues, contact])} class="border border-l-white/50 border-r-white/50 border-t-white/75 border-b-white/25 bg-m-blue px-1 py-[0.5] rounded cursor-pointer hover:outline-white hover:outline-1">{contact.name}</div>
                     )}
                 </For>
-                <button class="bg-black border border-white px-1 py-[0.5] rounded cursor-pointer hover:outline-white hover:outline-1">+ Add Contact</button>
-            </div> */}
+                <button class="border border-l-white/50 border-r-white/50 border-t-white/75 border-b-white/25 bg-black px-1 py-[0.5] rounded cursor-pointer hover:outline-white hover:outline-1">+ Add Contact</button>
+            </div>
         </div >
     )
 }
\ No newline at end of file