Minor fixes to remove unused imports, etc
Updates to fix annoying filter serialization bug