320 Fix sanitize plugin bugs