Add 2 new entities.
Fix wrong cursor position after move-current-line-up/down.