Restored highlighting of the current identifier and search