Changing to just generating geojson and rendering on client. Some SQL fixes