Better handling choices + html conform.