question queue fixes