Nicer highlight query