Make sure the holdings array is an array in javascript (and not an object)
Merge branch 'refactor' into merge