refactor json
fixed location + year