allow SWL for queues, minor refactor