Merge "hygiene: small special:search refactor"