Fixed device display when both --device and --remove-disabled options are used.