Fix #6 - Custom Value Selector

#6

blocking on UX final ver.