Added fix for restoring filters