TokenConverter => added check of query when using mongos
merged