bug936916 - Update with safe filter

https://bugzilla.mozilla.org/show_bug.cgi?id=936916