Fix delete bugs from Controller side.