Disambiguate the filter categories
BUG:423388 (cherry picked from commit af7851cd21a86ba862fef0a6ab644d109a2e014c)