When can we expect an update to address this issue? I find it beyond frustrating that the plugs appear before the switches as I can only assume 90%+ of users change the state of their switches more...