r6044: Ensure the old search calls always ask mask_match to translate