Adjustment to subtopic next chapter handling