Revert "enhance strings in generated list pages avoiding composite strings( BUG 925288)"

This reverts commit e6b7358ee649cb64264154f95c4bcc7c6f9e71be.