fix cancel dem fill issue, and warning text