Add support for highlights in results