Add isTopLevel query for screens