Add name to result indicator
Fix field names and transaltions