Improved the attribute name filter