Change master detail charts and fixes