fix some report column names/expressions, #940, #25161