Added missing field logic to unsub_table