Add new query format count and