Modify Expression query

Attempt to handle resources typed in a different graph to their
descriptions.