Fix queue

- Re-add 'Dequeue Series' option, lost in earlier commit
- More cleanup