Bugfixes in highlighting data cursor