Small fix : when resource resolution was successful for some resource of type list and stored in the db, but failed for some other resource, the resolution is reloaded from the database and state restored instead of redoing resolution.   However, the type of the resource was not considered.  List resolved data elements would become string on the second attempt, impacting scripts expectations.

Improvement: I expose the occurrence property in the json payload passed in to template, in order to facilitate indexing in list data elements, often related to such multi-occurrences template resolution.