Include identifier and name in huts json
Properly list hut types.