Fix collection double parse
Merge pull request #90 from MSchip/front-end-refactor

Fix collection double parse