Correctly handle "includeBlankOption" and numeric columns (see #6373)