WSOTWO-138: Fixed problem with highlight of elements