did some refactoring in queue items controller