mock modal container: use more expressive syntax, primary report: handle case...

mock modal container: use more expressive syntax, primary report: handle case cast results in null value