Fixed encoding issue, almost done with highlight references