Fix global filter stores