Working on apps matching and reporting

 * renewed application matching
 * basic reporting fixed