Added subsection in on-tap