improve highlight request performance
perfect highlighting