Story 55690708: Cleaned up counts around sections in main trees