Fixed some elasticsearch issue