Removed todo
Removed todo
Replaced es5 filter function with shim