Minor fix to map only chpater
More starting work on grouping chapter.