fix mock values
add picklist support