Fixed some bugs. Added highlighting with diacritical strings