CHANGED: small changes on elastic searcher