Fix dict2rst with multiple choices
Fix match problems not displaying correctly in the "edit task" view + improvements