Handle default criteria values for run_table, fix criteria-list