Add isTopLevel field
Query has too many friend, just make it public
Lint fix