Deal with generation of org checkbox entries.
Removing call to the variable in different function and centralize into the dispatcher function.
Respect logical and convention (optional params are in last position)