Fix issues after merging
Fix AutoComplete. Add notification and control.