Fixed duplication of reports due to Wrangler re-firing on modifications. Also updated JSON and JS to do matched and non-matched subs properly.