template mapping improvements
Remove hardcoded localhost host