Fix id highlighting issue