WIP: fixing top-level-query/0