table fields added, improved enum selection