Fix for Type selector values when subtypes are being limited