now with elasticsearch in annex