merge case statement in choices with model correctly, refs #18