Fix speed issues with runtime. Swap out country/comment fields in return of runtimes (which did not work) with annotations