Fix I18n text and properly check for sectionst