Better JSON generation

 - Only include data used in search
 - Let the service object deal with which kpi to return