node: fix encoding of CHOICE
0.4.1
Plug submodels with function call

Implemented as suggested in #14