improvements from using in opensearch project