add kind attribute to destination form plus validations