Skittles broke header matching by adding the field type to the top of th...

...e manual entry table. This brings up lots of issuse, so I changed the header matching to work based on id instead of name