move SafeMarkup fix to part4