issue #21011: reverted search as variable