Filter component final changes