mostly fix issue with pollution between user category queues