Fixed order delete issue and elasticsearch refresh issue