Sync with updated elasticparser library