Make query counts their own feature and add @wip