fix parsers and add elasticsearch
Merge branch 'search'

* search:
  fix parsers and add elasticsearch