added type and type_id to queue