Handler fixes filter