fix bug with criterion entries
Fix distribution type string