More request queing re-factoring