fix noise part
respect that master-switch might send lists