template issues resolved