Making changes for security
Updates for further security
Reversed order of regex and string escape
Merge fix-templates