Fix anonymous mode queueing

not ready for review yet, still needs tests