Style and bug fix for qb queue