More fixes for username highlighting