add query based scoping