Update the section to support both title and id