Fix problem with filters after merge