Improved comment click support.