server/etl_api optimizations