refactor supervisor usage to only one main supervisor
fix error if missing values