refactor queue items controller even more. still kinda crazy in  there