Fixed templates bugs while client side deployment.