Issue 20040: More refactoring for none title issue