replacing the waiver definition fields from select to text (integer