another fix with previous

Conflicts:
	id_table.go
Fix bugs shown in retrack Xanza

Conflicts:
	id_table.go