Remove hacks for filtering of 'tabs'