update how elastic search handles queries, and setup proper indices mapping