Issue 21750: **Updated behavior for brushing/highlighting