AddDialog: store user selection for inclomplete selection, part I
AddDialog: store user selection for inclomplete selection, part II
AddDialog refactoring