[#666] Correctly handle attributes on form upload to not include redundant name attributes