Change regex syntax
Restore template content to work remotely