Improved a lot speed on data and map layers. Add indexes and simplofy geom. ready to be redeploy