Bug 911664 - [bb][refactor] Tabs and filters