Choice fields :: fix several minor issues

This request addresses a number of issues created from merging in new features into v1.9.4