CXX-295 include all query modifiers in count command