Bug with unworked highlight buttons was fixed