fixed templates : removed hard-coded strings