[WIP] Fix elasticsearch , move methods to concern