Check id map columns

Should address issues #718 and #684