Restructure of Elastic Search requests