Fixed counting of highlights
Fixed highlights
Fixed query highlights
Merge branch 'feature/fix-highlights' into develop