id field now '@id' instead of 'id'
fixed test for isEmpty