Fix notices and formatting for word replacement
Merge pull request #1814 from dlobo/MiscFixes

Fix notices and formatting for word replacement