Fixed regex in query
Fixed unmarshaling array of object issue