Device list improved