-fix multiple recalculation on detail fetch