fixes #3360
minor update
checkstyle fix
Merge pull request #3366 from bilalyasar/webfilter

fixes #3360 + unit test