Patch in secondary suppression on complex queries