Adjusted entities query to allow for attributes stored in different graphs