Use tab identifier rather than label for filtering / A little bit more organizing