Fixed onscreen data verification for composition data, pull request #15 from Robyn Forrest.
JC merge fix to tpl