Further update filter plugin to apply to a global scope