Fixed elastic-search