Upgraded the version and added the configutration option to disable the filtering