fix also generator template serving