Empty values to not select the first item

Also taking the value from the data store instead of the
'value' attribute on the select which isn't actually a to
spec attribute.

Change-Id: Ief447b6d35fcbb23daa104c625c9ae6e47670a05
Merge "Empty values to not select the first item"