More tweaks for (unfinished) TopTermsByTfIdf