Merge "Make the spelling and pluralization of "Active filters" consistent"