UNDERTOW-104 Fix issue with filter name mappings