refactored the update_queue controller flow