Include section titles also in segmentation

Change-Id: I77e1d228c2b5f823d664b60ea87be444361bb7eb