add QueryTokenString support for CountDistinct, CountNull and CountNotNull
add QueryTokenString support for CountDistinct, CountNull and CountNotNull

avifatal/framework,signumsoftware/framework,avifatal/framework,AlejandroCano/framework,AlejandroCano/framework,signumsoftware/framework