Bug 9044: (follow-up) Add a blank option + add missing 'for' attributes