Fix section counts and remove Mapped popovers