Refactor the jsonp support into filter