more bugfixes/hardening to queue_updated, seems to work well (no airplane mode)