Fixed comment swapping between answer/questions