Make exclude conditions consistent