Removing shared and local queries from high level concept in favor of making it an attribute on the query itself