Reduce the usage of Deferred in internal logic
Fix cell keyboard selection and cell edit conflict