Fix highlighting yourself and html encoded characters