This fixes #8227.  It will no longer have the field for the question mark when there is no device id specified.