RF-13851: fix highlighting