Added confirmation dialogs, fixed issue with Tag Picker