Append assigned type to subtype filter

Fix to include currently assigned subtype for now when not included in getAvailableSubTypes