Refactored token attribute filters