Fix problems with NONE for item types and subtypes