Separated JSON reading from LocationSystem
Fixed some bugs around