Issue #195: Some adjusts and the addition of an id check.