AC: Filter restoring tweaks... not sure right way to do client-side migrations