WIP converting to automatic updating of treepicker-<state> and treepicker-indirect-<indirect_state>