Expand eval candidate

Mostly add output labels instead of place holders in candidates