CHistoryComboBox bugfix and attempt for another bugfix