Fix filter supression handling