ensure correct comment order

and put back the @ mention escaping which was disabled by accident