site.url and highlight fixes