Feature/count queries