#510 ensure filters are restored correctly after changing layers