fixed issue with id key not set in data