add more entries
Auto_select_unique_candidate no longer supported