Issue #2326323 by MKorostoff: Allow targeting of ENTITY_TYPE__VIEW_MODE ...

Allow targeting of ENTITY_TYPE__VIEW_MODE and ENTITY_TYPE__BUNDLE individually