updated email and choice filed handling for use_as options