fix the bug of highlighting and renaming with macro