External filters are now properly carried over during .ini to registry and vise versa transition

And some minor refactoring