refactor queue items controller