jsonp filter refactoring