Modification for elasticsearch