[FEATURE] Fix losted comas and form