Bugs fixe for adding and removing embeds