Fixed parsing dates after refactoring
Implemented collection output as locationNameInstance of level 2