Fix issue #399 and issue #384 with regard to LanguageSupportPageNames behaviors