Adjust the spatial data request
Finished the spatial data request fixes