Update to keep same bbcodes and to have same bahaviour