api change due to commandtriggerconfig special label; minor fixes