* fix focus when adding and removing a unique key * cleanup Co-authored-by: REDMOND\gaausfel <gaausfel@microsoft.com>