Fixes work item 23981
wi-23992 Fix to Inappropriate Page Title Created
Merge pull request #3 from gigocabrera/master

Fixes to wi-23981 and wi-23992