Merge "Fix eleastisearch field limit"