remove extra include in elasticsearch
edits to query language
Merge branch 'stage'