Merge "HTMLForm: Show more options when incorrect displayFormat is set"