Use the context identity in the query, too