Cleanup filter initialization improvement