Duplication fix on forms and minor fixes in the metadata constant