Version 3.1.6: * improve highlight performance