Jan14Fix-2

Opportunity archive issue, quick start edit opportunity resolved