Fixed for ES search engine after major changes of the code

@ardnet Interesting, do we have a difference here ?