fix for #2311 and other issues in grid editors

The PR will:

1. Fix issue #2311.
2. Other changes in grid editors.