Convert a bunch of shallow queries to scopes
Add interface for indented lists (listNested)