Autocomplete / Form validation: Corrected markup for option elements (fixes #2721 and fixes #2823)