Fixed Filter and Startup handling.