Change queue_type to type in queue