Clean up code
Fix IE filter with multiple values