ES config improvements