Fix bugs with comment removal form