Search spec parsing moved into CD core