Added unit test for handling non-existent filter attributes.
Reduced complexity.