Bug 868388 - [Building Blocks] Filters should be updated(cherry picked from commit 1c1aa726652d3c4b4e803beec11b07de0b6ba5f5)