Resolve issue where an Entity is required in subgraphs and remove non-resolvable from _entity output

Resolve issue where an Entity is required in subgraphs and remove non-resolvable from _entity output #1296