be more forgiving to changes in results templates