Some remarks made in the pull request ENYO-2405 are treated. The rest of them will be treated as soon as the actuel bug is fixed.