Update to how shivanode subtype field is defined and handled so that it works within views.