Fix HTML link in escaped message and additional cleanup