safety filter & label fix
fix