Issue #2: Fix single option-value processing

Correct the processing so that single option-value download attributes
are properly restricted.