Added some minor changes to Elastic Search skeleton. Have some uncertainties about how to proceed. Will resolve tomorrow.