More fixes to senator data, refs #2327