Unload: fixed to use property name instead of table name.