final fixes for custom cost report