refactory queue view