[ELASTIC SEARCH] Improve ES management in selectors